Enable Swift in nightly builds

This commit is contained in:
James Turner 2019-05-24 09:31:51 +01:00
parent c3b9b9a524
commit abc616b548
3 changed files with 6 additions and 4 deletions

View File

@ -41,7 +41,7 @@ cp simgear-*.tar.bz2 ../output/.
##################################################################################### #####################################################################################
echo "Starting on FlightGear" echo "Starting on FlightGear"
cd ../fgBuild cd ../fgBuild
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DENABLE_COMPOSITOR:BOOL=ON DFG_BUILD_TYPE=Release ../flightgear cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DENABLE_COMPOSITOR:BOOL=ON -DENABLE_SWIFT:BOOL=ON -DFG_BUILD_TYPE=Release ../flightgear
# compile # compile
make make

View File

@ -38,7 +38,8 @@ cmake ..\flightgear -G "Visual Studio 14" ^
-DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^
-DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^ -DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^
-DFG_BUILD_TYPE=%FGBUILDTYPE% ^ -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-DENABLE_COMPOSITOR:BOOL=ON -DENABLE_COMPOSITOR:BOOL=ON ^
-DENABLE_SWIFT:BOOL=ON
cmake --build . --config RelWithDebInfo --target INSTALL cmake --build . --config RelWithDebInfo --target INSTALL
cd .. cd ..
@ -64,7 +65,8 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^
-DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^ -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^
-DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^
-DFG_BUILD_TYPE=%FGBUILDTYPE% ^ -DFG_BUILD_TYPE=%FGBUILDTYPE% ^
-DENABLE_COMPOSITOR:BOOL=ON -DENABLE_COMPOSITOR:BOOL=ON ^
-DENABLE_SWIFT:BOOL=ON
cmake --build . --config RelWithDebInfo --target INSTALL cmake --build . --config RelWithDebInfo --target INSTALL
cd .. cd ..

View File

@ -46,7 +46,7 @@ else
FGBUILDTYPE=Nightly FGBUILDTYPE=Nightly
fi fi
cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_COMPOSITOR:BOOL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_SWIFT:BOOL=ON -DENABLE_COMPOSITOR:BOOL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear
make make