[PATCH 1/1] Adapt build.sh if qmake is already in PATH on a Mac

Thiago Macieira thiago at macieira.org
Fri May 19 15:13:16 PDT 2017


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 <thiago at macieira.org>
---
 scripts/build.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 1e64b515..88437c76 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
-- 
2.12.2



More information about the subsurface mailing list