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-system: minor cleanup of build.sh

Browse source 
That qmake -query was added for debugging a long time ago.

Since the comment clearly indicate that the edit of the Makefile is only
for Travis, let's only do it when running on Travis.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-10-06 09:45:35 +02:00
parent 5c2181daa7
commit 6b9e77ba01
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/build.sh
View file

@ -430,13 +430,14 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then
mkdir -p build mkdir -p build
mkdir -p J10build mkdir -p J10build
cd build cd build
$QMAKE -query
$QMAKE "INCLUDEPATH=$INSTALL_ROOT/include" ../googlemaps.pro $QMAKE "INCLUDEPATH=$INSTALL_ROOT/include" ../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
# similarly, don't use -Wdata-time # similarly, don't use -Wdata-time
mv Makefile Makefile.bak if [ "$TRAVIS" = "true" ] ; then
cat Makefile.bak | sed -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' > Makefile mv Makefile Makefile.bak
cat Makefile.bak | sed -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' > Makefile
fi
make -j4 make -j4
make install make install
popd popd