From 9151b1706b78f36d0be7cac6a8cd576a1bc292ee Mon Sep 17 00:00:00 2001 From: Chris Esposito Date: Mon, 1 Apr 2019 21:22:50 +1100 Subject: [PATCH] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 252eb7ff..e74268c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ script: # OSX if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd Desktop_Interface - qmake CONFIG+=release PREFIX=/usr DEFINES+='GIT_HASH_SHORT=\\\"$(git rev-parse --short HEAD)\\\"' + qmake CONFIG+=release PREFIX=/usr 'DEFINES+=GIT_HASH_SHORT=\\\"$(git rev-parse --short HEAD)\\\"' make -j$(sysctl -n hw.ncpu) mkdir -p bin/Labrador.app/Contents/MacOS/Resources mkdir -p bin/Labrador.app/Contents/Frameworks @@ -62,7 +62,7 @@ script: #Linux elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd Desktop_Interface - qmake CONFIG+=release PREFIX=/usr DEFINES+='GIT_HASH_SHORT=\\\"$(git rev-parse --short HEAD)\\\"' + qmake CONFIG+=release PREFIX=/usr 'DEFINES+=GIT_HASH_SHORT=\\\"$(git rev-parse --short HEAD)\\\"' make -j$(nproc) CXX=${CXX} CC=${CC} LINK=${CXX} # - make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/ # NOTE: The following 5 lines should not be needed if "make install" would be made work for Labrador; see