From ffdd4f062f43adc1c955c5ae4d65924d7b32b566 Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 23 Oct 2018 12:10:01 +0100 Subject: [PATCH] Use Cmake -build to compile --- hudson_mac_build_release.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index a32b4b5..f5a543a 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -24,15 +24,14 @@ pushd sgBuild cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../simgear # compile -make +cmake --build . -j if [ $? -ne '0' ]; then echo "make simgear failed" exit 1 fi -make install - +cmake --build . --target install popd @@ -48,14 +47,14 @@ fi cmake -DFG_BUILD_TYPE=$FGBUILDTYPE -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../flightgear -make +cmake --build . -j if [ $? -ne '0' ]; then echo "make flightgear failed" exit 1 fi -make install +cmake --build . --target install popd