diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-01-02 15:48:04 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-01-02 15:48:04 +0000 |
| commit | e6960bcec4ab88337f7c25b53a4e1947651da380 (patch) | |
| tree | d517e86e76eb0e2a9ff150d8aa3032295f631c0b | |
| parent | 438ae0cadc7eeb56aa445f31dc2f5ff5fba9801a (diff) | |
| download | extra-cmake-modules-e6960bcec4ab88337f7c25b53a4e1947651da380.tar.gz extra-cmake-modules-e6960bcec4ab88337f7c25b53a4e1947651da380.tar.bz2 | |
-since cmake 2.6.2 the <package>_FIND_VERSION_(MAJOR|MINOR|PATCH) variables are initialized automatically to "0", so no need to do it manually here
Alex
CCMAIL: apaku@gmx.de
svn path=/trunk/KDE/kdelibs/; revision=904593
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 9948ce9c..563aeaee 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -419,30 +419,14 @@ else (_kdeBootStrapping) # Check the version of KDE. It must be at least KDE_MIN_VERSION as set by the user. # KDE_VERSION is set in KDELibsDependencies.cmake since KDE 4.0.x. Alex - # we need at least this version: + # Support for the new-style (>= 2.6.0) support for requiring some version of a package: if (NOT KDE_MIN_VERSION) - if (KDE4_FIND_VERSION_MAJOR) - if (${KDE4_FIND_VERSION_MAJOR} EQUAL 4) - if (KDE4_FIND_VERSION_MINOR) - set(KDE_MIN_VERSION "4.${KDE4_FIND_VERSION_MINOR}") - else (KDE4_FIND_VERSION_MINOR) - set(KDE_MIN_VERSION "4.0") - endif (KDE4_FIND_VERSION_MINOR) - if (KDE4_FIND_VERSION_PATCH) - set(KDE_MIN_VERSION "${KDE_MIN_VERSION}.${KDE4_FIND_VERSION_PATCH}") - else (KDE4_FIND_VERSION_PATCH) - set(KDE_MIN_VERSION "${KDE_MIN_VERSION}.0") - endif (KDE4_FIND_VERSION_PATCH) - else (${KDE4_FIND_VERSION_MAJOR} EQUAL 4) - message(FATAL_ERROR "FindKDE4 can only be used for finding KDE 4 (not for KDE ${KDE4_FIND_VERSION_MAJOR}).") - endif (${KDE4_FIND_VERSION_MAJOR} EQUAL 4) - else (KDE4_FIND_VERSION_MAJOR) - set (KDE_MIN_VERSION "4.0.0") + set(KDE_MIN_VERSION "${KDE4_FIND_VERSION_MAJOR}.${KDE4_FIND_VERSION_MINOR}.${KDE4_FIND_VERSION_PATCH}") endif (KDE4_FIND_VERSION_MAJOR) endif (NOT KDE_MIN_VERSION) - #message(STATUS "KDE_MIN_VERSION=${KDE_MIN_VERSION} found ${KDE_VERSION}") + #message(FATAL_ERROR "KDE_MIN_VERSION=${KDE_MIN_VERSION} found ${KDE_VERSION} exact: -${KDE4_FIND_VERSION_EXACT}- version: -${KDE4_FIND_VERSION}-") macro_ensure_version( ${KDE_MIN_VERSION} ${KDE_VERSION} KDE4_INSTALLED_VERSION_OK ) # This file contains the exported library target from kdelibs (new with cmake 2.6.x) |