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

Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4

Browse Source 
The FindKDE4 module (incorrectly) modifies CMAKE_MODULE_PATH on the
caller's behalf.  This causes KDE4-installed find modules to be used by
the test instead of those in CMake.  Teach the test to restore the
CMAKE_MODULE_PATH to its original value after each find_package call.
This ensures that the next find_package actually tests our module.
This commit is contained in:
Brad King 2014-03-19 13:33:00 -04:00
parent 8b8691adca
commit cf3e87e195
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tests/CMakeOnly/AllFindModules/CMakeLists.txt
View File

@ -8,11 +8,14 @@ endif ()
# Avoid ctest truncation of output # Avoid ctest truncation of output
message(STATUS "CTEST_FULL_OUTPUT") message(STATUS "CTEST_FULL_OUTPUT")
set(ORIGINAL_MODULE_PATH "${CMAKE_MODULE_PATH}")
file(GLOB FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../Modules/Find*.cmake" ) file(GLOB FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../Modules/Find*.cmake" )
macro(do_find MODULE_NAME) macro(do_find MODULE_NAME)
message(STATUS " Checking Find${MODULE_NAME}") message(STATUS " Checking Find${MODULE_NAME}")
find_package(${MODULE_NAME}) find_package(${MODULE_NAME})
set(CMAKE_MODULE_PATH "${ORIGINAL_MODULE_PATH}")
endmacro() endmacro()
# It is only possible to use either Qt3 or Qt4 in one project. # It is only possible to use either Qt3 or Qt4 in one project.