From 3c4b4fffd0a6739e8771e4d552d98d21d294a84b Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Thu, 26 Jan 2012 22:17:10 +0100 Subject: CMakeOnly.AllFindModules: always check FindQt --- Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt index d28ac01..0c22e00 100644 --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt @@ -19,8 +19,9 @@ endmacro(do_find) # Since FindQt will complain if both are found we explicitely # filter out this and FindQt3. FindKDE3 also depends on Qt3 and # is therefore also blocked -set(NO_QT4_MODULES "Qt" "Qt3" "KDE3") +set(NO_QT4_MODULES "Qt3" "KDE3") +set(DESIRED_QT_VERSION 4) foreach(FIND_MODULE ${FIND_MODULES}) string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}") @@ -33,7 +34,8 @@ endforeach(FIND_MODULE) # Qt4 is not present, so we can check Qt3 if (NOT QT4_FOUND) - foreach(FIND_MODULE ${NO_QT4_MODULES}) + set(DESIRED_QT_VERSION 3) + foreach(FIND_MODULE ${NO_QT4_MODULES} "Qt") do_find(${FIND_MODULE}) endforeach(FIND_MODULE) endif (NOT QT4_FOUND) -- cgit v0.12