diff options
| author | Andreas Pakulat <apaku@gmx.de> | 2009-09-13 19:14:29 +0000 |
|---|---|---|
| committer | Andreas Pakulat <apaku@gmx.de> | 2009-09-13 19:14:29 +0000 |
| commit | ce7ce4677f1924fd15d62120ef683d16eca42186 (patch) | |
| tree | 2480601c42c5e71342047fb5ffc7a0762772844e | |
| parent | b99c22515244d08414cd3919edf4c1b2c5fa76dd (diff) | |
| download | extra-cmake-modules-ce7ce4677f1924fd15d62120ef683d16eca42186.tar.gz extra-cmake-modules-ce7ce4677f1924fd15d62120ef683d16eca42186.tar.bz2 | |
I shouldn't expect CMake's if-clause to be anything comparable to C/C++. Though
I wonder why I didn't catch this in my tests.
Having both conditions within the same if-clause doesn't work as CMake
apparently always evaluates the or-part.
svn path=/trunk/KDE/kdelibs/; revision=1023047
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 80e3656c..75cb9988 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -315,9 +315,13 @@ endif(KDE4_FIND_REQUIRED OR KDE4Internal_FIND_REQUIRED) # if the minimum Qt requirement is changed, change all occurrence in the # following lines -if( NOT QT_MIN_VERSION OR ${QT_MIN_VERSION} VERSION_LESS "4.5.0" ) +if( NOT QT_MIN_VERSION ) set(QT_MIN_VERSION "4.5.0") -endif( NOT QT_MIN_VERSION OR ${QT_MIN_VERSION} VERSION_LESS "4.5.0" ) +endif( NOT QT_MIN_VERSION ) +if( ${QT_MIN_VERSION} VERSION_LESS "4.5.0" ) + set(QT_MIN_VERSION "4.5.0") +endif( ${QT_MIN_VERSION} VERSION_LESS "4.5.0" ) + #this line includes FindQt4.cmake, which searches the Qt library and headers find_package(Qt4 ${_REQ_STRING_KDE4}) |