[cmake-commits] king committed CMakeLists.txt 1.6 1.7 FindVersionTestA.cmake NONE 1.1 FindVersionTestB.cmake NONE 1.1 FindVersionTestC.cmake NONE 1.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/FindPackageTest
In directory public:/mounts/ram/cvs-serv9907/Tests/FindPackageTest

Modified Files:
	CMakeLists.txt 
Added Files:
	FindVersionTestA.cmake FindVersionTestB.cmake 
	FindVersionTestC.cmake 
Log Message:
ENH: Implement version support in the find_package command module mode.  Version numbers provided to the command are converted to variable settings to tell the FindXXX.cmake module what version is requested.  This addresses issue #1645.


--- NEW FILE: FindVersionTestA.cmake ---
IF(NOT "${VersionTestA_FIND_VERSION}" STREQUAL "1")
  MESSAGE(SEND_ERROR "VersionTestA_FIND_VERSION=${VersionTestA_FIND_VERSION} is not 1")
ENDIF(NOT "${VersionTestA_FIND_VERSION}" STREQUAL "1")
IF(NOT "${VersionTestA_FIND_VERSION_MAJOR}" STREQUAL "1")
  MESSAGE(SEND_ERROR "VersionTestA_FIND_VERSION_MAJOR=${VersionTestA_FIND_VERSION_MAJOR} is not 1")
ENDIF(NOT "${VersionTestA_FIND_VERSION_MAJOR}" STREQUAL "1")
IF(DEFINED VersionTestA_FIND_VERSION_MINOR)
  MESSAGE(SEND_ERROR "VersionTestA_FIND_VERSION_MINOR should not be defined")
ENDIF(DEFINED VersionTestA_FIND_VERSION_MINOR)
IF(DEFINED VersionTestA_FIND_VERSION_PATCH)
  MESSAGE(SEND_ERROR "VersionTestA_FIND_VERSION_PATCH should not be defined")
ENDIF(DEFINED VersionTestA_FIND_VERSION_PATCH)

--- NEW FILE: FindVersionTestB.cmake ---
IF(NOT "${VersionTestB_FIND_VERSION}" STREQUAL "1.2")
  MESSAGE(SEND_ERROR "VersionTestB_FIND_VERSION=${VersionTestB_FIND_VERSION} is not 1.2")
ENDIF(NOT "${VersionTestB_FIND_VERSION}" STREQUAL "1.2")
IF(NOT "${VersionTestB_FIND_VERSION_MAJOR}" STREQUAL "1")
  MESSAGE(SEND_ERROR "VersionTestB_FIND_VERSION_MAJOR=${VersionTestB_FIND_VERSION_MAJOR} is not 1")
ENDIF(NOT "${VersionTestB_FIND_VERSION_MAJOR}" STREQUAL "1")
IF(NOT "${VersionTestB_FIND_VERSION_MINOR}" STREQUAL "2")
  MESSAGE(SEND_ERROR "VersionTestB_FIND_VERSION_MINOR=${VersionTestB_FIND_VERSION_MINOR} is not 2")
ENDIF(NOT "${VersionTestB_FIND_VERSION_MINOR}" STREQUAL "2")
IF(DEFINED VersionTestB_FIND_VERSION_PATCH)
  MESSAGE(SEND_ERROR "VersionTestB_FIND_VERSION_PATCH should not be defined")
ENDIF(DEFINED VersionTestB_FIND_VERSION_PATCH)

--- NEW FILE: FindVersionTestC.cmake ---
IF(NOT "${VersionTestC_FIND_VERSION}" STREQUAL "1.2.3")
  MESSAGE(SEND_ERROR "VersionTestC_FIND_VERSION=${VersionTestC_FIND_VERSION} is not 1.2.3")
ENDIF(NOT "${VersionTestC_FIND_VERSION}" STREQUAL "1.2.3")
IF(NOT "${VersionTestC_FIND_VERSION_MAJOR}" STREQUAL "1")
  MESSAGE(SEND_ERROR "VersionTestC_FIND_VERSION_MAJOR=${VersionTestC_FIND_VERSION_MAJOR} is not 1")
ENDIF(NOT "${VersionTestC_FIND_VERSION_MAJOR}" STREQUAL "1")
IF(NOT "${VersionTestC_FIND_VERSION_MINOR}" STREQUAL "2")
  MESSAGE(SEND_ERROR "VersionTestC_FIND_VERSION_MINOR=${VersionTestC_FIND_VERSION_MINOR} is not 2")
ENDIF(NOT "${VersionTestC_FIND_VERSION_MINOR}" STREQUAL "2")
IF(NOT "${VersionTestC_FIND_VERSION_PATCH}" STREQUAL "3")
  MESSAGE(SEND_ERROR "VersionTestC_FIND_VERSION_PATCH=${VersionTestC_FIND_VERSION_PATCH} is not 3")
ENDIF(NOT "${VersionTestC_FIND_VERSION_PATCH}" STREQUAL "3")

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/CMakeLists.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CMakeLists.txt	17 Jan 2008 14:06:35 -0000	1.6
+++ CMakeLists.txt	21 Jan 2008 13:48:33 -0000	1.7
@@ -22,6 +22,13 @@
   CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}")
 ENDIF(NOT FOO_DIR)
 
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+FIND_PACKAGE(VersionTestA 1)
+FIND_PACKAGE(VersionTestB 1.2)
+FIND_PACKAGE(VersionTestC 1.2.3)
+
+#-----------------------------------------------------------------------------
+
 #SET(CMAKE_FIND_DEBUG_MODE 1)
 
 # For purposes of the test wipe out previous find results.