[Cmake-commits] CMake branch, next, updated. v2.8.7-2148-g2980cf8
Rolf Eike Beer
eike at sf-mail.de
Wed Jan 18 12:23:43 EST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2980cf8b255028a250c67d42351784af3cbf318d (commit)
via 8d830436a42ec06555334b5c5ec73b41328d5f06 (commit)
from a05fab177193b56504df92f438dc22dba85e0c9e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2980cf8b255028a250c67d42351784af3cbf318d
commit 2980cf8b255028a250c67d42351784af3cbf318d
Merge: a05fab1 8d83043
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 18 12:23:40 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 18 12:23:40 2012 -0500
Merge topic 'test_find_modules' into next
8d83043 AllFindModules test: also check Qt3 modules if Qt4 is not found
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d830436a42ec06555334b5c5ec73b41328d5f06
commit 8d830436a42ec06555334b5c5ec73b41328d5f06
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 18 18:23:21 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jan 18 18:23:21 2012 +0100
AllFindModules test: also check Qt3 modules if Qt4 is not found
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 06b4736..8a38f06 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -10,6 +10,11 @@ message(STATUS "CTEST_FULL_OUTPUT")
file(GLOB FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../Modules/Find*.cmake" )
+macro(do_find MODULE_NAME)
+ message(STATUS " Checking Find${MODULE_NAME}")
+ find_package(${MODULE_NAME})
+endmacro(do_find)
+
foreach(FIND_MODULE ${FIND_MODULES})
string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}")
@@ -21,8 +26,14 @@ foreach(FIND_MODULE ${FIND_MODULES})
if (NOT MODULE_NAME STREQUAL "Qt" AND
NOT MODULE_NAME STREQUAL "Qt3" AND
NOT MODULE_NAME STREQUAL "KDE3")
- message(STATUS " Checking Find${MODULE_NAME}")
- find_package(${MODULE_NAME})
+ do_find(${MODULE_NAME})
endif ()
endforeach(FIND_MODULE)
+
+# Qt4 is not present, so we can check Qt3
+if(NOT QT4_FOUND)
+ foreach(FIND_MODULE "Qt3" "Qt" "KDE3")
+ do_find(${FIND_MODULE})
+ endforeach(FIND_MODULE)
+endif(NOT QT4_FOUND)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list