diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-08-26 09:36:27 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-08-26 11:49:39 -0700 |
| commit | 8cd4c73217b36f24b395a6e6a3df5774bd7acce2 (patch) | |
| tree | 1f4fe0c6d2bc2207c9558676f6d440b4b3d3f799 | |
| parent | d6c013f3039892c788411c8641688fa9cb6c97e5 (diff) | |
| download | subsurface-8cd4c73217b36f24b395a6e6a3df5774bd7acce2.tar.gz | |
build.sh: find qmake earlier in the script
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | scripts/build.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index b1081163e..e25d2c55c 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -132,6 +132,13 @@ export PKG_CONFIG_PATH=$INSTALL_ROOT/lib/pkgconfig:$PKG_CONFIG_PATH echo Building in $SRC, installing in $INSTALL_ROOT +# find qmake +if [ ! -z $CMAKE_PREFIX_PATH ] ; then + QMAKE=$CMAKE_PREFIX_PATH/../../bin/qmake +else + QMAKE=qmake +fi + # set up the right file name extensions if [ $PLATFORM = Darwin ] ; then SH_LIB_EXT=dylib @@ -320,8 +327,7 @@ make install if [ $PLATFORM = Darwin ] ; then if [ -z "$CMAKE_PREFIX_PATH" ] ; then - # qmake in PATH? - libdir=`qmake -query QT_INSTALL_LIBS` + libdir=`$QMAKE -query QT_INSTALL_LIBS` if [ $? -eq 0 ]; then export CMAKE_PREFIX_PATH=$libdir/cmake elif [ -d "$HOME/Qt/5.9.1" ] ; then @@ -445,11 +451,6 @@ git checkout master git pull --rebase mkdir -p build cd build -if [ ! -z $CMAKE_PREFIX_PATH ] ; then - QMAKE=$CMAKE_PREFIX_PATH/../../bin/qmake -else - QMAKE=qmake -fi $QMAKE ../googlemaps.pro # on Travis the compiler doesn't support c++1z, yet qmake adds that flag; # since things compile fine with c++11, let's just hack that away |