From 6bfb1f5200c1f7a6b32f93a200ff1b36791a638b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 19 May 2017 15:13:16 -0700 Subject: Adapt build.sh if qmake is already in PATH on a Mac Some people (like me) have Qt elsewhere. So long as qmake is in PATH, we should be able to support it. Signed-off-by: Thiago Macieira Signed-off-by: Dirk Hohndel --- scripts/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 1e64b5156..88437c765 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -174,7 +174,11 @@ if [ $BUILDMARBLE = 1 ]; then mkdir -p build cd build if [ $PLATFORM = Darwin ] ; then - if [ -d "$HOME/Qt/5.8" ] ; then + # qmake in PATH? + libdir=`qmake -query QT_INSTALL_LIBS` + if [ $? -eq 0 ]; then + export CMAKE_PREFIX_PATH=$libdir/cmake + elif [ -d "$HOME/Qt/5.8" ] ; then export CMAKE_PREFIX_PATH=~/Qt/5.8/clang_64/lib/cmake elif [ -d "$HOME/Qt/5.7" ] ; then export CMAKE_PREFIX_PATH=~/Qt/5.7/clang_64/lib/cmake -- cgit v1.2.3-70-g09d2