diff options
| author | Alex Neundorf <neundorf@kde.org> | 2011-08-05 20:42:57 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2011-08-05 20:42:57 (GMT) |
| commit | 208bb9009bda2b41eeee747c34e536f561df8a59 (patch) | |
| tree | ea1e72884806f7b0b76089fa865e92e3ece03e0c /Modules/BasicConfigVersion-SameMajorVersion.cmake.in | |
| parent | bb03c2dd3a9afafd6c24ea12e16edf4f9189813f (diff) | |
| download | CMake-208bb9009bda2b41eeee747c34e536f561df8a59.zip CMake-208bb9009bda2b41eeee747c34e536f561df8a59.tar.gz CMake-208bb9009bda2b41eeee747c34e536f561df8a59.tar.bz2 | |
Set UNSUITABLE instead of not COMPATIBLE
Alex
Diffstat (limited to 'Modules/BasicConfigVersion-SameMajorVersion.cmake.in')
| -rw-r--r-- | Modules/BasicConfigVersion-SameMajorVersion.cmake.in | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/Modules/BasicConfigVersion-SameMajorVersion.cmake.in b/Modules/BasicConfigVersion-SameMajorVersion.cmake.in index f633ee8..8d091ea 100644 --- a/Modules/BasicConfigVersion-SameMajorVersion.cmake.in +++ b/Modules/BasicConfigVersion-SameMajorVersion.cmake.in @@ -12,34 +12,31 @@ set(PACKAGE_VERSION "@CVF_VERSION@") -set(PACKAGE_VERSION_EXACT FALSE) # initialize to FALSE - -# check that the installed version has the same 32/64bit-ness as the one which is currently searching: -if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@") - math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8") - set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)") - set(PACKAGE_VERSION_COMPATIBLE FALSE) +if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) + set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) - set(PACKAGE_VERSION_COMPATIBLE FALSE) + if("@CVF_VERSION@" MATCHES "^([0-9]+)\\.") + set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") else() + set(CVF_VERSION_MAJOR "@CVF_VERSION@") + endif() - if("@CVF_VERSION@" MATCHES "^([0-9]+)\\.") - set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") - else() - set(CVF_VERSION_MAJOR "@CVF_VERSION@") - endif() - - if("${PACKAGE_FIND_VERSION_MAJOR}" STREQUAL "${CVF_VERSION_MAJOR}") - set(PACKAGE_VERSION_COMPATIBLE TRUE) - else() - set(PACKAGE_VERSION_COMPATIBLE FALSE) - endif() - - if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") - set(PACKAGE_VERSION_EXACT TRUE) - endif() + if("${PACKAGE_FIND_VERSION_MAJOR}" STREQUAL "${CVF_VERSION_MAJOR}") + set(PACKAGE_VERSION_COMPATIBLE TRUE) + else() + set(PACKAGE_VERSION_COMPATIBLE FALSE) endif() + if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() + + +# check that the installed version has the same 32/64bit-ness as the one which is currently searching: +if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@") + math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8") + set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)") + set(PACKAGE_VERSION_UNSUITABLE TRUE) endif() |