[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.8.2.4 1.8.2.5

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in changes from CVS to branch for 2.6.3 RC 8


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/CMakeLists.txt,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C 2 -d -r1.8.2.4 -r1.8.2.5
*** CMakeLists.txt	24 Oct 2008 15:18:58 -0000	1.8.2.4
--- CMakeLists.txt	13 Jan 2009 18:03:55 -0000	1.8.2.5
***************
*** 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 VersionedD VersionedE
    wibbleA wibbleB
    RecursiveA RecursiveB RecursiveC
***************
*** 61,64 ****
--- 61,67 ----
  FIND_PACKAGE(VersionedA 2 NAMES zot)
  FIND_PACKAGE(VersionedB 3.1 EXACT NAMES zot)
+ FIND_PACKAGE(VersionedC 4.0 EXACT NAMES zot)
+ FIND_PACKAGE(VersionedD 1.1 EXACT NAMES Baz)
+ FIND_PACKAGE(VersionedE 1.2 EXACT NAMES Baz)
  
  # HINTS should override the system but PATHS should not
***************
*** 87,90 ****
--- 90,96 ----
  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(VersionedD_EXPECTED "Baz 1.1/BazConfig.cmake")
+ SET(VersionedE_EXPECTED "Baz 1.2/CMake/BazConfig.cmake")
  SET(wibbleA_EXPECTED "A/wibble-config.cmake")
  SET(wibbleB_EXPECTED "B/wibble-config.cmake")