summaryrefslogtreecommitdiffstats
path: root/Tests/FindPackageTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-12-09 19:07:19 (GMT)
committerBrad King <brad.king@kitware.com>2008-12-09 19:07:19 (GMT)
commite51969ac4935999779be2cb8b74a06b218d73dd0 (patch)
tree6c77b95571928b1dad028ebd6a7f250d6658a105 /Tests/FindPackageTest
parent4f5a8b9c0c5d72837981880c5a795d69acd73dac (diff)
downloadCMake-e51969ac4935999779be2cb8b74a06b218d73dd0.zip
CMake-e51969ac4935999779be2cb8b74a06b218d73dd0.tar.gz
CMake-e51969ac4935999779be2cb8b74a06b218d73dd0.tar.bz2
ENH: Add useful search locations to find_package
This teaches find_package to search <prefix>/(share|lib)/cmake/<name>*/ for package configuration files. Packages that do not already have files in a <prefix>/lib/<name>* directory can use this location to avoid cluttering the lib directory.
Diffstat (limited to 'Tests/FindPackageTest')
-rw-r--r--Tests/FindPackageTest/CMakeLists.txt4
-rw-r--r--Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config-version.cmake (renamed from Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake)0
-rw-r--r--Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config.cmake (renamed from Tests/FindPackageTest/lib/zot-3.1/zot-config.cmake)0
3 files changed, 2 insertions, 2 deletions
diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt
index 62a4dc7..b6691e7 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -85,12 +85,12 @@ SET(TApp_EXPECTED
SET(Tapp_EXPECTED
"TApp.app/Contents/Resources/cmake/tapp-config.cmake")
SET(VersionedA_EXPECTED "lib/zot-2.0/zot-config.cmake")
-SET(VersionedB_EXPECTED "lib/zot-3.1/zot-config.cmake")
+SET(VersionedB_EXPECTED "lib/cmake/zot-3.1/zot-config.cmake")
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")
+SET(RecursiveC_EXPECTED "lib/cmake/zot-3.1/zot-config.cmake")
# Check the results.
FOREACH(p ${PACKAGES})
diff --git a/Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake b/Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config-version.cmake
index b54d94c..b54d94c 100644
--- a/Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake
+++ b/Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config-version.cmake
diff --git a/Tests/FindPackageTest/lib/zot-3.1/zot-config.cmake b/Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config.cmake
index deffa57..deffa57 100644
--- a/Tests/FindPackageTest/lib/zot-3.1/zot-config.cmake
+++ b/Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config.cmake