diff options
| author |  Jeroen Massar <jeroen@massar.ch> | 2016-03-16 09:26:16 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-03-16 07:33:58 -0700 |
| commit | 1bea93d6eecff39c43dbdb94f1af6b3c9df3240e (patch) | |
| tree | 07019c4d4408148abb60b1f84accbd7d838130d7 | |
| parent | 777ee8a5cdaad9b5a0ed75aa049b6d842be1306b (diff) | |
| download | subsurface-1bea93d6eecff39c43dbdb94f1af6b3c9df3240e.tar.gz | |
build.sh: detect user's Qt5.5 + Qt5.6
As in master: detect Qt path and Homebrew qt5 + preserve that path in
CMAKE_PREFIX_PATH and pass it along to cmake
Signed-off-by: Jeroen Massar <jeroen@massar.ch>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -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 |