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: find qmake earlier in the script

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-08-26 09:36:27 -07:00
parent d6c013f303
commit 8cd4c73217
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/build.sh
View file

@ -132,6 +132,13 @@ export PKG_CONFIG_PATH=$INSTALL_ROOT/lib/pkgconfig:$PKG_CONFIG_PATH
echo Building in $SRC, installing in $INSTALL_ROOT echo Building in $SRC, installing in $INSTALL_ROOT
# find qmake
if [ ! -z $CMAKE_PREFIX_PATH ] ; then
QMAKE=$CMAKE_PREFIX_PATH/../../bin/qmake
else
QMAKE=qmake
fi
# set up the right file name extensions # set up the right file name extensions
if [ $PLATFORM = Darwin ] ; then if [ $PLATFORM = Darwin ] ; then
SH_LIB_EXT=dylib SH_LIB_EXT=dylib
@ -320,8 +327,7 @@ make install
if [ $PLATFORM = Darwin ] ; then if [ $PLATFORM = Darwin ] ; then
if [ -z "$CMAKE_PREFIX_PATH" ] ; then if [ -z "$CMAKE_PREFIX_PATH" ] ; then
# qmake in PATH? libdir=`$QMAKE -query QT_INSTALL_LIBS`
libdir=`qmake -query QT_INSTALL_LIBS`
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
export CMAKE_PREFIX_PATH=$libdir/cmake export CMAKE_PREFIX_PATH=$libdir/cmake
elif [ -d "$HOME/Qt/5.9.1" ] ; then elif [ -d "$HOME/Qt/5.9.1" ] ; then
@ -445,11 +451,6 @@ git checkout master
git pull --rebase git pull --rebase
mkdir -p build mkdir -p build
cd build cd build
if [ ! -z $CMAKE_PREFIX_PATH ] ; then
QMAKE=$CMAKE_PREFIX_PATH/../../bin/qmake
else
QMAKE=qmake
fi
$QMAKE ../googlemaps.pro $QMAKE ../googlemaps.pro
# on Travis the compiler doesn't support c++1z, yet qmake adds that flag; # 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 # since things compile fine with c++11, let's just hack that away