diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-08 13:48:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-12 13:44:28 (GMT) |
| commit | ac24a1c031a5ccb01c2a978655757e71c3f9acba (patch) | |
| tree | 38f2326d20e1a4ef06ecaf70dbffc23c3085e7e3 /Tests | |
| parent | c010e7cc806d845f1b048bc8c41d2c1326075beb (diff) | |
| download | CMake-ac24a1c031a5ccb01c2a978655757e71c3f9acba.zip CMake-ac24a1c031a5ccb01c2a978655757e71c3f9acba.tar.gz CMake-ac24a1c031a5ccb01c2a978655757e71c3f9acba.tar.bz2 | |
Tests: Improve FindPackageTest exported package version
Add a random version component so that the test is unlikely to conflict
with other tests of the same CMake version on the same machine.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/FindPackageTest/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt index a77713f..fc82a1e 100644 --- a/Tests/FindPackageTest/CMakeLists.txt +++ b/Tests/FindPackageTest/CMakeLists.txt @@ -320,16 +320,23 @@ endif() #----------------------------------------------------------------------------- # Test export(PACKAGE) with find_package. + +# Choose a unique version. +string(REGEX REPLACE "-.*$" "" version ${CMAKE_VERSION}) +string(RANDOM LENGTH 4 ALPHABET "0123456789" v) +set(version "${version}.${v}") + message(STATUS "Preparing export(PACKAGE) test project") try_compile(EXPORTER_COMPILED ${FindPackageTest_BINARY_DIR}/Exporter ${FindPackageTest_SOURCE_DIR}/Exporter CMakeTestExportPackage dummy + CMAKE_FLAGS + -Dversion=${version} OUTPUT_VARIABLE output) message(STATUS "Searching for export(PACKAGE) test project") set(CMakeTestExportPackage_DIR "" CACHE FILEPATH "Wipe out find results for testing." FORCE) -string(REGEX REPLACE "-.*$" "" version ${CMAKE_VERSION}) find_package(CMakeTestExportPackage 1.${version} EXACT REQUIRED) #----------------------------------------------------------------------------- diff --git a/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in b/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in index 42bd84e..6eac6e6 100644 --- a/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in +++ b/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in @@ -1,5 +1,5 @@ # Test config file. -set(PACKAGE_VERSION "1.@CMAKE_VERSION@") +set(PACKAGE_VERSION "1.@version@") if("${PACKAGE_FIND_VERSION}" VERSION_EQUAL "${PACKAGE_VERSION}") set(PACKAGE_VERSION_COMPATIBLE 1) set(PACKAGE_VERSION_EXACT 1) |