diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-08-02 18:57:09 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-08-02 19:05:16 -0700 |
| commit | f57f10eb8c9ecc5bb3e297477c38cca1bc3f60f2 (patch) | |
| tree | cf144dd2f376b3b28e7e4d683083f86eb81e8d1f /scripts | |
| parent | 2b9523dcff372dbc4a877c14f2a0ece32ae57959 (diff) | |
| download | subsurface-f57f10eb8c9ecc5bb3e297477c38cca1bc3f60f2.tar.gz | |
build.sh: follow our build pattern a bit more
Build in a 'build' subdirectory and use the INSTALL_ROOT. Also make sure
you find qmake on custom Qt installations.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index a5c1f0fff..8ded61f06 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -442,7 +442,14 @@ fi cd googlemaps git checkout master git pull --rebase -qmake +mkdir -p build +cd build +if [ ! -z $CMAKE_PREFIX_PATH ] ; then + QMAKE=$CMAKE_PREFIX_PATH/../../bin/qmake +else + QMAKE=qmake +fi +$QMAKE PREFIX=$INSTALL_ROOT ../googlemaps.pro make -j4 make install |