From ce7ce4677f1924fd15d62120ef683d16eca42186 Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Sun, 13 Sep 2009 19:14:29 +0000 Subject: 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 --- modules/FindKDE4Internal.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'modules') 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}) -- cgit v1.2.1