mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: don't show spurious errors looking for qmake

Browse source 
And improve the message if we do indeed not find it.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-09-05 17:12:44 -07:00
parent fde266860e
commit 11993b59ca
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/build.sh
View file

@ -141,9 +141,9 @@ echo Building in $SRC, installing in $INSTALL_ROOT
if [ ! -z $CMAKE_PREFIX_PATH ] ; then if [ ! -z $CMAKE_PREFIX_PATH ] ; then
QMAKE=$CMAKE_PREFIX_PATH/../../bin/qmake QMAKE=$CMAKE_PREFIX_PATH/../../bin/qmake
else else
hash qmake > /dev/null && QMAKE=qmake hash qmake > /dev/null 2> /dev/null && QMAKE=qmake
[ -z $QMAKE ] && hash qmake-qt5 > /dev/null && QMAKE=qmake-qt5 [ -z $QMAKE ] && hash qmake-qt5 > /dev/null 2> /dev/null && QMAKE=qmake-qt5
[ -z $QMAKE ] && echo "cannot find qmake" && exit 1 [ -z $QMAKE ] && echo "cannot find qmake or qmake-qt5" && exit 1
fi fi
# on Debian and Ubuntu based systems, the private QtLocation and # on Debian and Ubuntu based systems, the private QtLocation and