kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2014-05-08 09:48:21 -04:00
parent c010e7cc80
commit ac24a1c031
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tests/FindPackageTest/CMakeLists.txt
View File

@ -320,16 +320,23 @@ endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Test export(PACKAGE) with find_package. # 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") message(STATUS "Preparing export(PACKAGE) test project")
try_compile(EXPORTER_COMPILED try_compile(EXPORTER_COMPILED
${FindPackageTest_BINARY_DIR}/Exporter ${FindPackageTest_BINARY_DIR}/Exporter
${FindPackageTest_SOURCE_DIR}/Exporter ${FindPackageTest_SOURCE_DIR}/Exporter
CMakeTestExportPackage dummy CMakeTestExportPackage dummy
CMAKE_FLAGS
-Dversion=${version}
OUTPUT_VARIABLE output) OUTPUT_VARIABLE output)
message(STATUS "Searching for export(PACKAGE) test project") message(STATUS "Searching for export(PACKAGE) test project")
set(CMakeTestExportPackage_DIR "" CACHE FILEPATH set(CMakeTestExportPackage_DIR "" CACHE FILEPATH
"Wipe out find results for testing." FORCE) "Wipe out find results for testing." FORCE)
string(REGEX REPLACE "-.*$" "" version ${CMAKE_VERSION})
find_package(CMakeTestExportPackage 1.${version} EXACT REQUIRED) find_package(CMakeTestExportPackage 1.${version} EXACT REQUIRED)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

2
Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in
View File

@ -1,5 +1,5 @@
# Test config file. # Test config file.
set(PACKAGE_VERSION "1.@CMAKE_VERSION@") set(PACKAGE_VERSION "1.@version@")
if("${PACKAGE_FIND_VERSION}" VERSION_EQUAL "${PACKAGE_VERSION}") if("${PACKAGE_FIND_VERSION}" VERSION_EQUAL "${PACKAGE_VERSION}")
set(PACKAGE_VERSION_COMPATIBLE 1) set(PACKAGE_VERSION_COMPATIBLE 1)
set(PACKAGE_VERSION_EXACT 1) set(PACKAGE_VERSION_EXACT 1)