kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set UNSUITABLE instead of not COMPATIBLE 

Alex
This commit is contained in:
Alex Neundorf 2011-08-05 22:42:57 +02:00
parent bb03c2dd3a
commit 208bb9009b
3 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
View File

@ -10,15 +10,6 @@
set(PACKAGE_VERSION "@CVF_VERSION@") 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)
else()
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
set(PACKAGE_VERSION_COMPATIBLE FALSE) set(PACKAGE_VERSION_COMPATIBLE FALSE)
else() else()
@ -28,4 +19,9 @@ else()
endif() endif()
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() endif()

15
Modules/BasicConfigVersion-SameMajorVersion.cmake.in
View File

@ -12,15 +12,6 @@
set(PACKAGE_VERSION "@CVF_VERSION@") 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)
else()
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
set(PACKAGE_VERSION_COMPATIBLE FALSE) set(PACKAGE_VERSION_COMPATIBLE FALSE)
else() else()
@ -42,4 +33,10 @@ else()
endif() endif()
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() endif()

11
Tests/FindPackageTest/CMakeLists.txt
View File

@ -350,12 +350,16 @@ write_basic_config_version_file(${CMAKE_CURRENT_BINARY_DIR}/Boo123ConfigVersion.
VERSION 1.2.3 VERSION 1.2.3
COMPATIBILITY SameMajorVersion) COMPATIBILITY SameMajorVersion)
set(PACKAGE_VERSION_EXACT FALSE)
set(PACKAGE_FIND_VERSION 2.3.4) set(PACKAGE_FIND_VERSION 2.3.4)
set(PACKAGE_FIND_VERSION_MAJOR 2) set(PACKAGE_FIND_VERSION_MAJOR 2)
include(${CMAKE_CURRENT_BINARY_DIR}/Boo123ConfigVersion.cmake) include(${CMAKE_CURRENT_BINARY_DIR}/Boo123ConfigVersion.cmake)
if(PACKAGE_VERSION_COMPATIBLE) if(PACKAGE_VERSION_COMPATIBLE)
message(SEND_ERROR "Found Boo123 with version 1.2.3, but 2.3.4 was requested !") message(SEND_ERROR "Found Boo123 with version 1.2.3, but 2.3.4 was requested !")
endif() endif()
if(PACKAGE_VERSION_EXACT)
message(SEND_ERROR "PACKAGE_VERSION_EXACT set, although it should not be !")
endif()
set(PACKAGE_FIND_VERSION 0.0.1) set(PACKAGE_FIND_VERSION 0.0.1)
set(PACKAGE_FIND_VERSION_MAJOR 0) set(PACKAGE_FIND_VERSION_MAJOR 0)
@ -363,6 +367,9 @@ include(${CMAKE_CURRENT_BINARY_DIR}/Boo123ConfigVersion.cmake)
if(PACKAGE_VERSION_COMPATIBLE) if(PACKAGE_VERSION_COMPATIBLE)
message(SEND_ERROR "Found Boo123 with version 1.2.3, but 0.0.1 was requested !") message(SEND_ERROR "Found Boo123 with version 1.2.3, but 0.0.1 was requested !")
endif() endif()
if(PACKAGE_VERSION_EXACT)
message(SEND_ERROR "PACKAGE_VERSION_EXACT set, although it should not be !")
endif()
set(PACKAGE_FIND_VERSION 1.0.0) set(PACKAGE_FIND_VERSION 1.0.0)
set(PACKAGE_FIND_VERSION_MAJOR 1) set(PACKAGE_FIND_VERSION_MAJOR 1)
@ -383,3 +390,7 @@ endif()
if(NOT PACKAGE_VERSION_EXACT) if(NOT PACKAGE_VERSION_EXACT)
message(SEND_ERROR "PACKAGE_VERSION_EXACT not set, although it should be !") message(SEND_ERROR "PACKAGE_VERSION_EXACT not set, although it should be !")
endif() endif()
if(PACKAGE_VERSION_UNSUITABLE)
message(SEND_ERROR "PACKAGE_VERSION_UNSUITABLE set, but must not be !")
endif()