zhyang-dev/ThirdParty-common
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/ThirdParty-common.git synced 2025-12-08 06:57:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: initial support for building ParaView with QT5

Browse Source 
- still issues with the required version
  eg, system has qt-5.5, but ParaView tries to use qt-5.6
This commit is contained in:
mark
2016-11-23 15:52:24 +01:00
parent ed0c63889e
commit 0f5e1d6732
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
etc/tools/ParaViewFunctions
View File

@ -307,23 +307,31 @@ addQtSupport()
# parse -> "Using Qt version X.Y.Z in ..." # parse -> "Using Qt version X.Y.Z in ..."
QtVersion=$($qmake -query QT_VERSION) QtVersion=$($qmake -query QT_VERSION)
# Split Major.Minor.Revision - could also use IFS hacking case "$QtVersion" in
set -- $(echo "$QtVersion" | sed -e 's/\./ /g') 3.* | 4.[0-4]*)
# QT is too old
cat <<ERROR
----
Error: ${0##*/}
QtMajor=$1 QT version ($QtVersion) provided < 4.5
QtMinor=$2 Please use the -qmake option to specify the location of a newer QT version
For example,
if [ $QtMajor -lt 4 -o $QtMajor -eq 4 -a $QtMinor -lt 5 ] ... -qmake /usr/local/qt-4.6.2/bin/qmake
then ... -qmake $installBASE/qt-4.6.2/bin/qmake
echo "*** Error: Qt version provided < 4.5" ----
echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.5" ERROR
echo "*** e.g."
echo "*** -qmake /usr/local/qt-4.6.2/bin/qmake"
echo "*** -qmake $installBASE/qt-4.6.2/bin/qmake"
exit 1 exit 1
fi ;;
5.*)
# QT4 is the default, must specify QT5 explicitly
addCMakeVariable "PARAVIEW_QT_VERSION:STRING=5"
;;
esac
else else
echo "*** Error: cannot find qmake either at \$QMAKE_PATH or in current \$PATH" echo "Error: cannot find qmake either at \$QMAKE_PATH or in current \$PATH"
echo
exit 1 exit 1
fi fi
} }