[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.8.2.1 1.8.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in changes from head


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/CMakeLists.txt,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C 2 -d -r1.8.2.1 -r1.8.2.2
*** CMakeLists.txt	25 Mar 2008 23:59:12 -0000	1.8.2.1
--- CMakeLists.txt	13 Jun 2008 12:55:19 -0000	1.8.2.2
***************
*** 37,40 ****
--- 37,41 ----
    foo Foo Bar TFramework Tframework TApp Tapp Special
    VersionedA VersionedB
+   wibbleA wibbleB
    )
  FOREACH(p ${PACKAGES})
***************
*** 59,62 ****
--- 60,68 ----
  FIND_PACKAGE(VersionedB 3.1 EXACT NAMES zot)
  
+ # HINTS should override the system but PATHS should not
+ LIST(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/A")
+ FIND_PACKAGE(wibbleA NAMES wibble PATHS B)
+ FIND_PACKAGE(wibbleB NAMES wibble HINTS B)
+ 
  # Expected locations at which packages should be found.
  SET(foo_EXPECTED "lib/foo-1.2/foo-config.cmake")
***************
*** 74,77 ****
--- 80,85 ----
  SET(VersionedA_EXPECTED "lib/zot-2.0/zot-config.cmake")
  SET(VersionedB_EXPECTED "lib/zot-3.1/zot-config.cmake")
+ SET(wibbleA_EXPECTED "A/wibble-config.cmake")
+ SET(wibbleB_EXPECTED "B/wibble-config.cmake")
  
  # Check the results.