From f57f10eb8c9ecc5bb3e297477c38cca1bc3f60f2 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 2 Aug 2017 18:57:09 -0700 Subject: 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 --- scripts/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'scripts') 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 -- cgit v1.2.3-70-g09d2