diff options
| -rwxr-xr-x | scripts/build.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 02bb3a695..73b06015b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -142,7 +142,14 @@ fi mkdir -p build cd build if [ $PLATFORM = Darwin ] ; then - export CMAKE_PREFIX_PATH=~/Qt/5.5/clang_64/lib/cmake + if [ -d "~/Qt/5.5" ] ; then + export CMAKE_PREFIX_PATH=~/Qt/5.5/clang_64/lib/cmake + elif [ -d "~/Qt/5.6" ] ; then + export CMAKE_PREFIX_PATH=~/Qt/5.6/clang_64/lib/cmake + elif [ -d /usr/local/opt/qt5/lib ] ; then + # Homebrew location for qt5 package + export CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake + fi fi cmake -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE -DQT5BUILD=ON \ -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT \ @@ -200,7 +207,7 @@ fi cd $SRC/subsurface mkdir -p build cd build -export CMAKE_PREFIX_PATH=$INSTALL_ROOT/lib/cmake +export CMAKE_PREFIX_PATH="$INSTALL_ROOT/lib/cmake;${CMAKE_PREFIX_PATH}" cmake -DCMAKE_BUILD_TYPE=Debug .. \ -DLIBGIT2_INCLUDE_DIR=$INSTALL_ROOT/include \ -DLIBGIT2_LIBRARIES=$INSTALL_ROOT/lib/libgit2.$SH_LIB_EXT \ @@ -208,6 +215,7 @@ cmake -DCMAKE_BUILD_TYPE=Debug .. \ -DLIBDIVECOMPUTER_LIBRARIES=$INSTALL_ROOT/lib/libdivecomputer.a \ -DMARBLE_INCLUDE_DIR=$INSTALL_ROOT/include \ -DMARBLE_LIBRARIES=$INSTALL_ROOT/lib/libssrfmarblewidget.$SH_LIB_EXT \ + -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH \ -DNO_PRINTING=OFF \ -DUSE_LIBGIT23_API=1 |