summaryrefslogtreecommitdiffstats
path: root/Tests/CMakeOnly
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2012-01-26 21:17:10 (GMT)
committerRolf Eike Beer <eike@sf-mail.de>2012-01-26 21:33:33 (GMT)
commit3c4b4fffd0a6739e8771e4d552d98d21d294a84b (patch)
treee7faa230ee030f5f63371db7b9c2dce2217961fd /Tests/CMakeOnly
parent9d72b25a861bdcc69bf08e7494884027c341f7c9 (diff)
downloadCMake-3c4b4fffd0a6739e8771e4d552d98d21d294a84b.zip
CMake-3c4b4fffd0a6739e8771e4d552d98d21d294a84b.tar.gz
CMake-3c4b4fffd0a6739e8771e4d552d98d21d294a84b.tar.bz2
CMakeOnly.AllFindModules: always check FindQt
Diffstat (limited to 'Tests/CMakeOnly')
-rw-r--r--Tests/CMakeOnly/AllFindModules/CMakeLists.txt6
1 files 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)