[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.14 1.15

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Strengthen FindPackageTest version check

The previous change to test finding in lib/cmake/<name>* weakened the
versioned find tests.  Since the lib/cmake paths are searched before
lib/<name>* paths the previous change skipped requiring the command to
ignore zot-3.0 when finding zot-3.1.  This change restores that and adds
zot-4.0 to test the lib/cmake path.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/CMakeLists.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** CMakeLists.txt	9 Dec 2008 19:07:19 -0000	1.14
--- CMakeLists.txt	16 Dec 2008 14:13:39 -0000	1.15
***************
*** 37,41 ****
  SET(PACKAGES
    foo Foo Bar TFramework Tframework TApp Tapp Special
!   VersionedA VersionedB
    wibbleA wibbleB
    RecursiveA RecursiveB RecursiveC
--- 37,41 ----
  SET(PACKAGES
    foo Foo Bar TFramework Tframework TApp Tapp Special
!   VersionedA VersionedB VersionedC
    wibbleA wibbleB
    RecursiveA RecursiveB RecursiveC
***************
*** 61,64 ****
--- 61,65 ----
  FIND_PACKAGE(VersionedA 2 NAMES zot)
  FIND_PACKAGE(VersionedB 3.1 EXACT NAMES zot)
+ FIND_PACKAGE(VersionedC 4.0 EXACT NAMES zot)
  
  # HINTS should override the system but PATHS should not
***************
*** 86,95 ****
    "TApp.app/Contents/Resources/cmake/tapp-config.cmake")
  SET(VersionedA_EXPECTED "lib/zot-2.0/zot-config.cmake")
! SET(VersionedB_EXPECTED "lib/cmake/zot-3.1/zot-config.cmake")
  SET(wibbleA_EXPECTED "A/wibble-config.cmake")
  SET(wibbleB_EXPECTED "B/wibble-config.cmake")
  SET(RecursiveA_EXPECTED "lib/RecursiveA/recursivea-config.cmake")
  SET(RecursiveB_EXPECTED "lib/zot-2.0/zot-config.cmake")
! SET(RecursiveC_EXPECTED "lib/cmake/zot-3.1/zot-config.cmake")
  
  # Check the results.
--- 87,97 ----
    "TApp.app/Contents/Resources/cmake/tapp-config.cmake")
  SET(VersionedA_EXPECTED "lib/zot-2.0/zot-config.cmake")
! SET(VersionedB_EXPECTED "lib/zot-3.1/zot-config.cmake")
! SET(VersionedC_EXPECTED "lib/cmake/zot-4.0/zot-config.cmake")
  SET(wibbleA_EXPECTED "A/wibble-config.cmake")
  SET(wibbleB_EXPECTED "B/wibble-config.cmake")
  SET(RecursiveA_EXPECTED "lib/RecursiveA/recursivea-config.cmake")
  SET(RecursiveB_EXPECTED "lib/zot-2.0/zot-config.cmake")
! SET(RecursiveC_EXPECTED "lib/zot-3.1/zot-config.cmake")
  
  # Check the results.