Merge topic 'fix-AllFindModules-test-module-path'
cf3e87e1
Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4
This commit is contained in:
commit
aa8f8777a4
|
@ -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.
|
||||||
|
|
Loading…
Reference in New Issue