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/lib | |
| 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/lib')
| -rw-r--r-- | Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config-version.cmake | 8 | ||||
| -rw-r--r-- | Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config.cmake (renamed from Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config.cmake) | 0 | ||||
| -rw-r--r-- | Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake (renamed from Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config-version.cmake) | 0 | ||||
| -rw-r--r-- | Tests/FindPackageTest/lib/zot-3.1/zot-config.cmake | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config-version.cmake b/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config-version.cmake new file mode 100644 index 0000000..606945f --- /dev/null +++ b/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config-version.cmake @@ -0,0 +1,8 @@ +SET(PACKAGE_VERSION 4.0) +IF("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 4) + SET(PACKAGE_VERSION_COMPATIBLE 1) + IF("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 0) + SET(PACKAGE_VERSION_EXACT 1) + ENDIF("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 0) +ENDIF("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 4) + diff --git a/Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config.cmake b/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config.cmake index deffa57..deffa57 100644 --- a/Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config.cmake +++ b/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config.cmake diff --git a/Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config-version.cmake b/Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake index b54d94c..b54d94c 100644 --- a/Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config-version.cmake +++ b/Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake diff --git a/Tests/FindPackageTest/lib/zot-3.1/zot-config.cmake b/Tests/FindPackageTest/lib/zot-3.1/zot-config.cmake new file mode 100644 index 0000000..deffa57 --- /dev/null +++ b/Tests/FindPackageTest/lib/zot-3.1/zot-config.cmake @@ -0,0 +1 @@ +# Test config file. |