mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
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>
This commit is contained in:
parent
2b9523dcff
commit
f57f10eb8c
1 changed files with 8 additions and 1 deletions
|
@ -442,7 +442,14 @@ fi
|
||||||
cd googlemaps
|
cd googlemaps
|
||||||
git checkout master
|
git checkout master
|
||||||
git pull --rebase
|
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 -j4
|
||||||
make install
|
make install
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue