kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CMakeOnly.AllFindModules: always check FindQt

This commit is contained in:
Rolf Eike Beer 2012-01-26 22:17:10 +01:00
parent 9d72b25a86
commit 3c4b4fffd0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/CMakeOnly/AllFindModules/CMakeLists.txt
View File

@ -19,8 +19,9 @@ endmacro(do_find)
# Since FindQt will complain if both are found we explicitely # Since FindQt will complain if both are found we explicitely
# filter out this and FindQt3. FindKDE3 also depends on Qt3 and # filter out this and FindQt3. FindKDE3 also depends on Qt3 and
# is therefore also blocked # 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}) foreach(FIND_MODULE ${FIND_MODULES})
string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}") 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 # Qt4 is not present, so we can check Qt3
if (NOT QT4_FOUND) 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}) do_find(${FIND_MODULE})
endforeach(FIND_MODULE) endforeach(FIND_MODULE)
endif (NOT QT4_FOUND) endif (NOT QT4_FOUND)