diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-07 19:41:06 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-07 19:41:06 (GMT) |
| commit | 7f5961f9355f3672abd8d681d9f100087c83a254 (patch) | |
| tree | 776fbfc489c1be9e056586c5242fc8fa2f5b2ecb /Tests | |
| parent | d4134352abf69374fdad24d53d67734a135daaa5 (diff) | |
| parent | 796c618cccf9bc1887ff3ca297d3f69fce0fcb75 (diff) | |
| download | CMake-7f5961f9355f3672abd8d681d9f100087c83a254.zip CMake-7f5961f9355f3672abd8d681d9f100087c83a254.tar.gz CMake-7f5961f9355f3672abd8d681d9f100087c83a254.tar.bz2 | |
Merge topic 'no-duplicate-find-tests'
796c618 blacklist tests with their own test in Tests/Module from AllFindModules test
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt index 739593c..691728a 100644 --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt @@ -22,11 +22,18 @@ endmacro() set(DESIRED_QT_VERSION 4) set(NO_QT4_MODULES "Qt3" "KDE3") +# ignore everything that has it's own test in Tests/Module/ +file(GLOB OWN_TEST_MODULES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../../Module/" "${CMAKE_CURRENT_SOURCE_DIR}/../../Module/Find*") +foreach(FIND_MODULE IN LISTS OWN_TEST_MODULES) + string(REGEX REPLACE "^Find" "" _MOD_NAME "${FIND_MODULE}") + list(APPEND NO_FIND_MODULES "${_MOD_NAME}") +endforeach() + # These modules are named Find*.cmake, but are nothing that works in # find_package(). -set(NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage") +list(APPEND NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage") -foreach(FIND_MODULE ${FIND_MODULES}) +foreach(FIND_MODULE IN LISTS FIND_MODULES) string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}") list(FIND NO_QT4_MODULES ${MODULE_NAME} NO_QT4_INDEX) |