From 41d1059af1cbf55224f0a0d3caa560348812b5e7 Mon Sep 17 00:00:00 2001 From: Henry Date: Sun, 17 May 2015 11:16:39 +0100 Subject: [PATCH] ParaViewFunctions: Updated Qt version check Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1088 --- etc/tools/ParaView4Functions | 4 ++-- etc/tools/ParaViewFunctions | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/tools/ParaView4Functions b/etc/tools/ParaView4Functions index 63385fbf..d5ccb426 100644 --- a/etc/tools/ParaView4Functions +++ b/etc/tools/ParaView4Functions @@ -325,10 +325,10 @@ addQtSupport() QtMajor=$1 QtMinor=$2 - if [ $QtMajor -lt 4 -o $QtMinor -lt 5 ] + if [[ ($QtMajor -lt 4) || ($QtMajor -eq 4 && $QtMinor -lt 5) ]] then echo "*** Error: Qt version provided < 4.5" - echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.3 " + echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.5 " echo "*** e.g." echo "*** -qmake /usr/local/qt-4.6.2/bin/qmake" echo "*** -qmake $installBASE/qt-4.6.2/bin/qmake" diff --git a/etc/tools/ParaViewFunctions b/etc/tools/ParaViewFunctions index c4811c66..96bf8a44 100644 --- a/etc/tools/ParaViewFunctions +++ b/etc/tools/ParaViewFunctions @@ -325,10 +325,10 @@ addQtSupport() QtMajor=$1 QtMinor=$2 - if [ $QtMajor -lt 4 -o $QtMinor -lt 5 ] + if [[ ($QtMajor -lt 4) || ($QtMajor -eq 4 && $QtMinor -lt 5) ]] then echo "*** Error: Qt version provided < 4.5" - echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.3 " + echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.5 " echo "*** e.g." echo "*** -qmake /usr/local/qt-4.6.2/bin/qmake" echo "*** -qmake $installBASE/qt-4.6.2/bin/qmake"