From 12e61e8c123afa59524cd2cd4f90358db3dfb403 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 27 Feb 2022 12:41:09 -0800 Subject: [PATCH] build-system: don't fail with multi-part path If the CMAKE_PREFIX_PATH is a multi element path the old code failed in very predictable ways. So instead simply fall back on the PATH to find qmake. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index aa53269b1..c1be9a1cb 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -221,7 +221,8 @@ echo Building from "$SRC", installing in "$INSTALL_ROOT" # find qmake if [ -n "$CMAKE_PREFIX_PATH" ] ; then QMAKE=$CMAKE_PREFIX_PATH/../../bin/qmake -else +fi +if [[ -z $QMAKE || ! -x $QMAKE ]] ; then hash qmake > /dev/null 2> /dev/null && QMAKE=qmake [ -z $QMAKE ] && hash qmake-qt5 > /dev/null 2> /dev/null && QMAKE=qmake-qt5 [ -z $QMAKE ] && echo "cannot find qmake or qmake-qt5" && exit 1