From 2dee9294969ff5ef85a4dacb13de70b8a9de03db Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Thu, 26 Jan 2012 22:26:00 +0100 Subject: [PATCH] CMakeOnly.AllFindModules: suppress two modules from testing FindPackageHandleStandardArgs and FindPackageMessage match the glob expression but are nothing that will usually be fed into find_package(). --- Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt index 0c22e001e..308177db3 100644 --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt @@ -21,12 +21,17 @@ endmacro(do_find) # is therefore also blocked set(NO_QT4_MODULES "Qt3" "KDE3") +# These modules are named Find*.cmake, but are nothing that works in +# find_package(). +set(NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage") + set(DESIRED_QT_VERSION 4) foreach(FIND_MODULE ${FIND_MODULES}) string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}") list(FIND NO_QT4_MODULES ${MODULE_NAME} NO_QT4_INDEX) - if (NO_QT4_INDEX EQUAL -1) + list(FIND NO_FIND_MODULES ${MODULE_NAME} NO_FIND_INDEX) + if (NO_QT4_INDEX EQUAL -1 AND NO_FIND_INDEX EQUAL -1) do_find(${MODULE_NAME}) endif ()