From dd9e5bb96fd69dc46605056b37230e68104a6b3b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel <dirk@hohndel.org> Date: Thu, 3 Aug 2017 16:50:23 -0700 Subject: build.sh: qmake should pick up our INSTALL_ROOT Signed-off-by: Dirk Hohndel <dirk@hohndel.org> --- scripts/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build.sh b/scripts/build.sh index 02802b03c..b1081163e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -125,6 +125,7 @@ fi mkdir -p install-root INSTALL_ROOT=$SRC/install-root +export INSTALL_ROOT # make sure we find our own packages first (e.g., libgit2 only uses pkg_config to find libssh2) export PKG_CONFIG_PATH=$INSTALL_ROOT/lib/pkgconfig:$PKG_CONFIG_PATH @@ -449,7 +450,7 @@ if [ ! -z $CMAKE_PREFIX_PATH ] ; then else QMAKE=qmake fi -$QMAKE PREFIX=$INSTALL_ROOT ../googlemaps.pro +$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 # similarly, don't use -Wdata-time -- cgit v1.2.3-70-g09d2