diff options
| author | Brad King <brad.king@kitware.com> | 2008-12-16 14:13:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-12-16 14:13:39 (GMT) |
| commit | 63e186a8e69e0283d4fa0499ee8679ebdd844e1d (patch) | |
| tree | 3753db7a53c27a332ed5ccae4b467f2df2af92bf /Tests/FindPackageTest/CMakeLists.txt | |
| parent | 8ecd9ed768ea7585ef7dc29ccd93aa52b5294791 (diff) | |
| download | CMake-63e186a8e69e0283d4fa0499ee8679ebdd844e1d.zip CMake-63e186a8e69e0283d4fa0499ee8679ebdd844e1d.tar.gz CMake-63e186a8e69e0283d4fa0499ee8679ebdd844e1d.tar.bz2 | |
ENH: Strengthen FindPackageTest version check
The previous change to test finding in lib/cmake/<name>* weakened the
versioned find tests. Since the lib/cmake paths are searched before
lib/<name>* paths the previous change skipped requiring the command to
ignore zot-3.0 when finding zot-3.1. This change restores that and adds
zot-4.0 to test the lib/cmake path.
Diffstat (limited to 'Tests/FindPackageTest/CMakeLists.txt')
| -rw-r--r-- | Tests/FindPackageTest/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt index b6691e7..30a1dd1 100644 --- a/Tests/FindPackageTest/CMakeLists.txt +++ b/Tests/FindPackageTest/CMakeLists.txt @@ -36,7 +36,7 @@ FIND_PACKAGE(VersionTestD 1.2.3.4) # For purposes of the test wipe out previous find results. SET(PACKAGES foo Foo Bar TFramework Tframework TApp Tapp Special - VersionedA VersionedB + VersionedA VersionedB VersionedC wibbleA wibbleB RecursiveA RecursiveB RecursiveC ) @@ -60,6 +60,7 @@ FIND_PACKAGE(Tapp CONFIGS tapp-config.cmake) FIND_PACKAGE(Special NAMES Suffix SuffixTest PATH_SUFFIXES test) FIND_PACKAGE(VersionedA 2 NAMES zot) FIND_PACKAGE(VersionedB 3.1 EXACT NAMES zot) +FIND_PACKAGE(VersionedC 4.0 EXACT NAMES zot) # HINTS should override the system but PATHS should not LIST(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/A") @@ -85,12 +86,13 @@ 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/cmake/zot-3.1/zot-config.cmake") +SET(VersionedB_EXPECTED "lib/zot-3.1/zot-config.cmake") +SET(VersionedC_EXPECTED "lib/cmake/zot-4.0/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/cmake/zot-3.1/zot-config.cmake") +SET(RecursiveC_EXPECTED "lib/zot-3.1/zot-config.cmake") # Check the results. FOREACH(p ${PACKAGES}) |