From 0ccd7b37f72b62c44879b2e69b7d75debe2d44fb Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 25 Mar 2013 02:54:55 +0100 Subject: [PATCH] Only use -DUNATTENDED=ON when running on windows. cmake complains about it being not used on all other platforms. --- scripts/configure_firestorm.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 39c0ffb20e..7ca6ab0f83 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -364,9 +364,10 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then TARGET="Unix Makefiles" elif [ \( $PLATFORM == "win32" \) ] ; then TARGET="Visual Studio 10" + UNATTENDED="-DUNATTENDED=ON" fi - cmake -G "$TARGET" ../indra $FMOD $KDU $PACKAGE -DUNATTENDED:BOOL=ON -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=32 -DCMAKE_BUILD_TYPE:STRING=$BTYPE -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU | tee $LOG + cmake -G "$TARGET" ../indra $FMOD $KDU $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=32 -DCMAKE_BUILD_TYPE:STRING=$BTYPE -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU | tee $LOG if [ $PLATFORM == "win32" ] ; then ../indra/tools/vstool/VSTool.exe --solution Firestorm.sln --startup firestorm-bin --workingdir firestorm-bin "..\\..\\indra\\newview" --config $BTYPE