mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build.sh: qmake should pick up our INSTALL_ROOT

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-08-03 16:50:23 -07:00
parent 0476f6dc18
commit dd9e5bb96f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/build.sh
View file

@ -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