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

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in changes for 2.6.3 RC 1


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/CMakeLists.txt,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C 2 -d -r1.8.2.3 -r1.8.2.4
*** CMakeLists.txt	12 Sep 2008 14:56:21 -0000	1.8.2.3
--- CMakeLists.txt	24 Oct 2008 15:18:58 -0000	1.8.2.4
***************
*** 39,42 ****
--- 39,43 ----
    VersionedA VersionedB
    wibbleA wibbleB
+   RecursiveA RecursiveB RecursiveC
    )
  FOREACH(p ${PACKAGES})
***************
*** 66,69 ****
--- 67,75 ----
  FIND_PACKAGE(wibbleB NAMES wibble HINTS B)
  
+ # Look for package with recursive find-modules.
+ FIND_PACKAGE(RecursiveA)
+ FIND_PACKAGE(RecursiveB 2)
+ FIND_PACKAGE(RecursiveC 3.1 EXACT)
+ 
  # Expected locations at which packages should be found.
  SET(foo_EXPECTED "lib/foo-1.2/foo-config.cmake")
***************
*** 83,86 ****
--- 89,95 ----
  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.