From a5623956872f9d0c9dc0f460cfeb118602e9912e Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 21 May 2009 17:45:56 +0100
Subject: [PATCH] Allow the setting of the Qt version via the path to the
appropriate qmake.
---
bin/buildParaView | 3 +++
bin/tools/buildParaViewFunctions | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/bin/buildParaView b/bin/buildParaView
index 76a0264e69b..35d027c3dae 100755
--- a/bin/buildParaView
+++ b/bin/buildParaView
@@ -56,6 +56,9 @@ MESA_LIBRARY="/usr/lib64/libOSMesa.so"
# extra QT gui support (useful for re-using the installation for engrid)
withQTSUPPORT=true
+# Set the path to the Qt-4.3.? qmake if the system Qt is other than this version
+#QMAKE_PATH=/usr/local/Trolltech/Qt-4.3.4/bin/qmake
+
#
# No further editing below this line
#------------------------------------------------------------------------------
diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions
index f1c6ffaed69..5b3ae1fec9c 100644
--- a/bin/tools/buildParaViewFunctions
+++ b/bin/tools/buildParaViewFunctions
@@ -170,6 +170,11 @@ addQtSupport()
[ "${withQTSUPPORT:=false}" = true ] || return
addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
+
+ if [ -n "$QMAKE_PATH" ]
+ then
+ addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=$QMAKE_PATH
+ fi
}
--
GitLab