summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com>2015-06-02 10:43:13 -0700
committerGravatar Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com>2015-06-02 10:43:13 -0700
commit0ae40b406993966610b31b8166c64065a8792d4c (patch)
tree95af740f07a865d79382ec2301dd74b5dd8ffacb
parent582368322966146368300fd4281a9fdd9ff669ec (diff)
downloadsubsurface-0ae40b406993966610b31b8166c64065a8792d4c.tar.gz
Build script: remove Subsurface.app before building on Mac
The make install step otherwise will give some odd warnings as it tries to adjust things from build to deploy. Signed-off-by: Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com>
-rwxr-xr-xscripts/build.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/build.sh b/scripts/build.sh
index 9e510abbd..361e02ca6 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -151,5 +151,9 @@ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT .. \
-DMARBLE_LIBRARIES=$INSTALL_ROOT/lib/libssrfmarblewidget.$SH_LIB_EXT \
-DUSE_LIBGIT23_API=1
+if [ $PLATFORM = Darwin ] ; then
+ rm -rf Subsurface.app
+fi
+
make -j4
make install