From 0c36cc3eef307265407ee89516916fc66ec585d3 Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 8 Dec 2015 18:40:02 +0000 Subject: [PATCH] Use make instead of xcodebuild to compile Mac. Xcode seems to be overriding the setting of min-macos-version, which is causing 10.7 and 10.8 support to fail. See if using make resolves this. --- hudson_mac_build_release.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index 240a3de..90b35cb 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -21,30 +21,35 @@ echo "Build path is: $PATH" ############################################################################### echo "Starting on SimGear" pushd sgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../simgear +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../simgear # compile -xcodebuild -configuration RelWithDebInfo -target install build +make $MAKEOPTIONS if [ $? -ne '0' ]; then echo "make simgear failed" exit 1 fi +make install + + popd ################################################################################ echo "Starting on FlightGear" pushd fgBuild -cmake -DFG_NIGHTLY=1 -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../flightgear +cmake -DFG_NIGHTLY=1 -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear -xcodebuild -configuration RelWithDebInfo -target install build +make $MAKEOPTIONS if [ $? -ne '0' ]; then echo "make flightgear failed" exit 1 fi +make install + popd chmod +x $WORKSPACE/dist/bin/osgversion