From c3b9b9a5247d85b3fc9d00560db714b11ca11cd6 Mon Sep 17 00:00:00 2001 From: James Turner Date: Thu, 23 May 2019 12:38:02 +0100 Subject: [PATCH] Enable compositor in nightly builds --- build_release_linux.sh | 2 +- build_release_windows.bat | 6 ++++-- hudson_mac_build_release.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build_release_linux.sh b/build_release_linux.sh index 9bc0484..e26aa52 100755 --- a/build_release_linux.sh +++ b/build_release_linux.sh @@ -41,7 +41,7 @@ cp simgear-*.tar.bz2 ../output/. ##################################################################################### echo "Starting on FlightGear" cd ../fgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DFG_BUILD_TYPE=Release ../flightgear +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DENABLE_COMPOSITOR:BOOL=ON DFG_BUILD_TYPE=Release ../flightgear # compile make diff --git a/build_release_windows.bat b/build_release_windows.bat index 729c292..a5b4d86 100755 --- a/build_release_windows.bat +++ b/build_release_windows.bat @@ -37,7 +37,8 @@ cmake ..\flightgear -G "Visual Studio 14" ^ -DBOOST_ROOT=%WORKSPACE%/windows-3rd-party ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^ -DCMAKE_PREFIX_PATH=%QT5SDK32%;%OSG32% ^ - -DFG_BUILD_TYPE=%FGBUILDTYPE% + -DFG_BUILD_TYPE=%FGBUILDTYPE% ^ + -DENABLE_COMPOSITOR:BOOL=ON cmake --build . --config RelWithDebInfo --target INSTALL cd .. @@ -62,7 +63,8 @@ cmake ..\flightgear -G "Visual Studio 14 Win64" ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc140-64 ^ -DCMAKE_PREFIX_PATH=%QT5SDK64%;%OSG64% ^ -DOSG_FSTREAM_EXPORT_FIXED=1 ^ - -DFG_BUILD_TYPE=%FGBUILDTYPE% + -DFG_BUILD_TYPE=%FGBUILDTYPE% ^ + -DENABLE_COMPOSITOR:BOOL=ON cmake --build . --config RelWithDebInfo --target INSTALL cd .. diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index a32b4b5..4ef0425 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -46,7 +46,7 @@ else FGBUILDTYPE=Nightly fi -cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear +cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_COMPOSITOR:BOOL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear make