Commit a5623956 authored by henry's avatar henry
Browse files

Allow the setting of the Qt version via the path to the appropriate qmake.

parent 10c2f6be
......@@ -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
#------------------------------------------------------------------------------
......
......@@ -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
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment