Skip to content

Commit

Permalink
build.sh: qmake should pick up our INSTALL_ROOT
Browse files Browse the repository at this point in the history
Signed-off-by: Dirk Hohndel <[email protected]>
  • Loading branch information
dirkhh committed Aug 3, 2017
1 parent 0476f6d commit dd9e5bb
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit dd9e5bb

Please sign in to comment.