[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.18.2.1 1.18.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Log Message:
CMake 2.8.1-rc1


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/CMakeLists.txt,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -C 2 -d -r1.18.2.1 -r1.18.2.2
*** CMakeLists.txt	9 Oct 2009 20:11:45 -0000	1.18.2.1
--- CMakeLists.txt	28 Jan 2010 21:48:14 -0000	1.18.2.2
***************
*** 41,44 ****
--- 41,45 ----
    wibbleA wibbleB
    RecursiveA RecursiveB RecursiveC
+   EnvA EnvB
    )
  FOREACH(p ${PACKAGES})
***************
*** 97,100 ****
--- 98,108 ----
  FIND_PACKAGE(RecursiveC 3.1 EXACT)
  
+ # Test <Package>_DIR environment variable.
+ # We erase the main prefix path to ensure the env var is used.
+ SET(CMAKE_PREFIX_PATH)
+ SET(ENV{EnvA_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/lib/zot-3.1")
+ FIND_PACKAGE(EnvA 3.1 EXACT QUIET NAMES zot) # Should Work
+ FIND_PACKAGE(EnvB 3.1 EXACT QUIET NAMES zot) # Should Fail
+ 
  # Expected locations at which packages should be found.
  SET(foo_EXPECTED "lib/foo-1.2/foo-config.cmake")
***************
*** 124,127 ****
--- 132,137 ----
  SET(RecursiveB_EXPECTED "lib/zot-2.0/zot-config.cmake")
  SET(RecursiveC_EXPECTED "lib/zot-3.1/zot-config.cmake")
+ SET(EnvA_EXPECTED "lib/zot-3.1/zot-config.cmake")
+ SET(EnvB_MISSING "EnvB_DIR-NOTFOUND")
  
  # Check the results.