diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-20 13:22:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-20 13:22:18 (GMT) |
| commit | aa8f8777a4209400b355ca7de10dc25660a45647 (patch) | |
| tree | cc011b0a58f92fae4dd58634eb48b4fba88de96b /Tests | |
| parent | e1c1f18e39020967c09bfaae2269e421c7091ca7 (diff) | |
| parent | cf3e87e195448af50a9b2f0ca02732756e82ff2f (diff) | |
| download | CMake-aa8f8777a4209400b355ca7de10dc25660a45647.zip CMake-aa8f8777a4209400b355ca7de10dc25660a45647.tar.gz CMake-aa8f8777a4209400b355ca7de10dc25660a45647.tar.bz2 | |
Merge topic 'fix-AllFindModules-test-module-path'
cf3e87e1 Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt index 691728a..15493be 100644 --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt @@ -8,11 +8,14 @@ endif () # Avoid ctest truncation of output message(STATUS "CTEST_FULL_OUTPUT") +set(ORIGINAL_MODULE_PATH "${CMAKE_MODULE_PATH}") + file(GLOB FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../Modules/Find*.cmake" ) macro(do_find MODULE_NAME) message(STATUS " Checking Find${MODULE_NAME}") find_package(${MODULE_NAME}) + set(CMAKE_MODULE_PATH "${ORIGINAL_MODULE_PATH}") endmacro() # It is only possible to use either Qt3 or Qt4 in one project. |