[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.8.2.2 1.8.2.3 FindVersionTestA.cmake 1.1 1.1.2.1 FindVersionTestB.cmake 1.1 1.1.2.1 FindVersionTestC.cmake 1.1 1.1.2.1 FindVersionTestD.cmake NONE 1.1.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Sep 12 10:56:23 EDT 2008
Update of /cvsroot/CMake/CMake/Tests/FindPackageTest
In directory public:/mounts/ram/cvs-serv22946/Tests/FindPackageTest
Modified Files:
Tag: CMake-2-6
CMakeLists.txt FindVersionTestA.cmake FindVersionTestB.cmake
FindVersionTestC.cmake
Added Files:
Tag: CMake-2-6
FindVersionTestD.cmake
Log Message:
ENH: 2.6.2 RC 4 merge into main tree
Index: FindVersionTestA.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/FindVersionTestA.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** FindVersionTestA.cmake 21 Jan 2008 13:48:33 -0000 1.1
--- FindVersionTestA.cmake 12 Sep 2008 14:56:21 -0000 1.1.2.1
***************
*** 5,12 ****
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)
--- 5,18 ----
MESSAGE(SEND_ERROR "VersionTestA_FIND_VERSION_MAJOR=${VersionTestA_FIND_VERSION_MAJOR} is not 1")
ENDIF(NOT "${VersionTestA_FIND_VERSION_MAJOR}" STREQUAL "1")
! IF(NOT "${VersionTestA_FIND_VERSION_MINOR}" STREQUAL "0")
! MESSAGE(SEND_ERROR "VersionTestA_FIND_VERSION_MINOR=${VersionTestA_FIND_VERSION_MINOR} is not 0")
! ENDIF(NOT "${VersionTestA_FIND_VERSION_MINOR}" STREQUAL "0")
! IF(NOT "${VersionTestA_FIND_VERSION_PATCH}" STREQUAL "0")
! MESSAGE(SEND_ERROR "VersionTestA_FIND_VERSION_PATCH=${VersionTestA_FIND_VERSION_PATCH} is not 0")
! ENDIF(NOT "${VersionTestA_FIND_VERSION_PATCH}" STREQUAL "0")
! IF(NOT "${VersionTestA_FIND_VERSION_TWEAK}" STREQUAL "0")
! MESSAGE(SEND_ERROR "VersionTestA_FIND_VERSION_TWEAK=${VersionTestA_FIND_VERSION_TWEAK} is not 0")
! ENDIF(NOT "${VersionTestA_FIND_VERSION_TWEAK}" STREQUAL "0")
! IF(NOT "${VersionTestA_FIND_VERSION_COUNT}" STREQUAL "1")
! MESSAGE(SEND_ERROR "VersionTestA_FIND_VERSION_COUNT=${VersionTestA_FIND_VERSION_COUNT} is not 1")
! ENDIF(NOT "${VersionTestA_FIND_VERSION_COUNT}" STREQUAL "1")
Index: FindVersionTestB.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/FindVersionTestB.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** FindVersionTestB.cmake 21 Jan 2008 13:48:33 -0000 1.1
--- FindVersionTestB.cmake 12 Sep 2008 14:56:21 -0000 1.1.2.1
***************
*** 8,12 ****
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)
--- 8,18 ----
MESSAGE(SEND_ERROR "VersionTestB_FIND_VERSION_MINOR=${VersionTestB_FIND_VERSION_MINOR} is not 2")
ENDIF(NOT "${VersionTestB_FIND_VERSION_MINOR}" STREQUAL "2")
! IF(NOT "${VersionTestB_FIND_VERSION_PATCH}" STREQUAL "0")
! MESSAGE(SEND_ERROR "VersionTestB_FIND_VERSION_PATCH=${VersionTestB_FIND_VERSION_PATCH} is not 0")
! ENDIF(NOT "${VersionTestB_FIND_VERSION_PATCH}" STREQUAL "0")
! IF(NOT "${VersionTestB_FIND_VERSION_TWEAK}" STREQUAL "0")
! MESSAGE(SEND_ERROR "VersionTestB_FIND_VERSION_TWEAK=${VersionTestB_FIND_VERSION_TWEAK} is not 0")
! ENDIF(NOT "${VersionTestB_FIND_VERSION_TWEAK}" STREQUAL "0")
! IF(NOT "${VersionTestB_FIND_VERSION_COUNT}" STREQUAL "2")
! MESSAGE(SEND_ERROR "VersionTestB_FIND_VERSION_COUNT=${VersionTestB_FIND_VERSION_COUNT} is not 2")
! ENDIF(NOT "${VersionTestB_FIND_VERSION_COUNT}" STREQUAL "2")
Index: FindVersionTestC.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/FindVersionTestC.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** FindVersionTestC.cmake 21 Jan 2008 13:48:33 -0000 1.1
--- FindVersionTestC.cmake 12 Sep 2008 14:56:21 -0000 1.1.2.1
***************
*** 11,12 ****
--- 11,18 ----
MESSAGE(SEND_ERROR "VersionTestC_FIND_VERSION_PATCH=${VersionTestC_FIND_VERSION_PATCH} is not 3")
ENDIF(NOT "${VersionTestC_FIND_VERSION_PATCH}" STREQUAL "3")
+ IF(NOT "${VersionTestC_FIND_VERSION_TWEAK}" STREQUAL "0")
+ MESSAGE(SEND_ERROR "VersionTestC_FIND_VERSION_TWEAK=${VersionTestC_FIND_VERSION_TWEAK} is not 0")
+ ENDIF(NOT "${VersionTestC_FIND_VERSION_TWEAK}" STREQUAL "0")
+ IF(NOT "${VersionTestC_FIND_VERSION_COUNT}" STREQUAL "3")
+ MESSAGE(SEND_ERROR "VersionTestC_FIND_VERSION_COUNT=${VersionTestC_FIND_VERSION_COUNT} is not 3")
+ ENDIF(NOT "${VersionTestC_FIND_VERSION_COUNT}" STREQUAL "3")
--- NEW FILE: FindVersionTestD.cmake ---
IF(NOT "${VersionTestD_FIND_VERSION}" STREQUAL "1.2.3.4")
MESSAGE(SEND_ERROR "VersionTestD_FIND_VERSION=${VersionTestD_FIND_VERSION} is not 1.2.3.4")
ENDIF(NOT "${VersionTestD_FIND_VERSION}" STREQUAL "1.2.3.4")
IF(NOT "${VersionTestD_FIND_VERSION_MAJOR}" STREQUAL "1")
MESSAGE(SEND_ERROR "VersionTestD_FIND_VERSION_MAJOR=${VersionTestD_FIND_VERSION_MAJOR} is not 1")
ENDIF(NOT "${VersionTestD_FIND_VERSION_MAJOR}" STREQUAL "1")
IF(NOT "${VersionTestD_FIND_VERSION_MINOR}" STREQUAL "2")
MESSAGE(SEND_ERROR "VersionTestD_FIND_VERSION_MINOR=${VersionTestD_FIND_VERSION_MINOR} is not 2")
ENDIF(NOT "${VersionTestD_FIND_VERSION_MINOR}" STREQUAL "2")
IF(NOT "${VersionTestD_FIND_VERSION_PATCH}" STREQUAL "3")
MESSAGE(SEND_ERROR "VersionTestD_FIND_VERSION_PATCH=${VersionTestD_FIND_VERSION_PATCH} is not 3")
ENDIF(NOT "${VersionTestD_FIND_VERSION_PATCH}" STREQUAL "3")
IF(NOT "${VersionTestD_FIND_VERSION_TWEAK}" STREQUAL "4")
MESSAGE(SEND_ERROR "VersionTestD_FIND_VERSION_TWEAK=${VersionTestD_FIND_VERSION_TWEAK} is not 4")
ENDIF(NOT "${VersionTestD_FIND_VERSION_TWEAK}" STREQUAL "4")
IF(NOT "${VersionTestD_FIND_VERSION_COUNT}" STREQUAL "4")
MESSAGE(SEND_ERROR "VersionTestD_FIND_VERSION_COUNT=${VersionTestD_FIND_VERSION_COUNT} is not 4")
ENDIF(NOT "${VersionTestD_FIND_VERSION_COUNT}" STREQUAL "4")
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/CMakeLists.txt,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C 2 -d -r1.8.2.2 -r1.8.2.3
*** CMakeLists.txt 13 Jun 2008 12:55:19 -0000 1.8.2.2
--- CMakeLists.txt 12 Sep 2008 14:56:21 -0000 1.8.2.3
***************
*** 28,31 ****
--- 28,32 ----
FIND_PACKAGE(VersionTestB 1.2)
FIND_PACKAGE(VersionTestC 1.2.3)
+ FIND_PACKAGE(VersionTestD 1.2.3.4)
#-----------------------------------------------------------------------------
***************
*** 145,146 ****
--- 146,164 ----
"Package Special is minor version [${Special_VERSION_MINOR}], not [2]")
ENDIF(NOT "${Special_VERSION_MINOR}" STREQUAL "2")
+
+ # Test version number comparison.
+ IF(NOT "1.2.3.4" VERSION_LESS "1.2.3.5")
+ MESSAGE(SEND_ERROR "1.2.3.4 VERSION_LESS 1.2.3.5 is not true!")
+ ENDIF()
+ IF(NOT "1.2" VERSION_LESS "1.10")
+ MESSAGE(SEND_ERROR "1.2 VERSION_LESS 1.10 is not true!")
+ ENDIF()
+ IF(NOT "1.02" VERSION_GREATER "1.1")
+ MESSAGE(SEND_ERROR "1.02 VERSION_GREATER 1.1 is not true!")
+ ENDIF()
+ IF("1.2.3" VERSION_GREATER "1.2.3.4")
+ MESSAGE(SEND_ERROR "1.2.3 VERSION_GREATER 1.2.3.4 is not false!")
+ ENDIF()
+ IF(NOT "1.2" VERSION_EQUAL "1.2.0.0")
+ MESSAGE(SEND_ERROR "1.2 VERSION_EQUAL 1.2.0.0 is not true!")
+ ENDIF()
More information about the Cmake-commits
mailing list