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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Teach find_package about more install dirs

We now search in

  <prefix>/<name>*/
  <prefix>/<name>*/(cmake|CMake)

when looking for package configuration files.  This is useful on Windows
since the Program Files folder is in CMAKE_SYSTEM_PREFIX_PATH.  These
paths are the Windows equivalent to the Apple convention application and
framework paths we already search.  See issue #8264.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FindPackageTest/CMakeLists.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** CMakeLists.txt	16 Dec 2008 14:13:39 -0000	1.15
--- CMakeLists.txt	17 Dec 2008 14:24:05 -0000	1.16
***************
*** 37,41 ****
  SET(PACKAGES
    foo Foo Bar TFramework Tframework TApp Tapp Special
!   VersionedA VersionedB VersionedC
    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
***************
*** 62,65 ****
--- 62,67 ----
  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
***************
*** 89,92 ****
--- 91,96 ----
  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")