[Cmake-commits] CMake branch, next, updated. v2.8.7-2291-gc7873aa

Rolf Eike Beer eike at sf-mail.de
Thu Jan 26 16:35:07 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  c7873aa952a8fc5bcf4883afcf0bf12833d764b3 (commit)
       via  2dee9294969ff5ef85a4dacb13de70b8a9de03db (commit)
       via  3c4b4fffd0a6739e8771e4d552d98d21d294a84b (commit)
       via  9d72b25a861bdcc69bf08e7494884027c341f7c9 (commit)
      from  aacd52a16bbc97b18adcf5fb137b3acf60491af2 (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=c7873aa952a8fc5bcf4883afcf0bf12833d764b3
commit c7873aa952a8fc5bcf4883afcf0bf12833d764b3
Merge: aacd52a 2dee929
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 16:35:02 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 16:35:02 2012 -0500

    Merge topic 'AllFindModules-test' into next
    
    2dee929 CMakeOnly.AllFindModules: suppress two modules from testing
    3c4b4ff CMakeOnly.AllFindModules: always check FindQt
    9d72b25 CMakeOnly.AllFindModules: clean up the Qt3/Qt4 code


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dee9294969ff5ef85a4dacb13de70b8a9de03db
commit 2dee9294969ff5ef85a4dacb13de70b8a9de03db
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 22:26:00 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Jan 26 22:33:33 2012 +0100

    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().

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 0c22e00..308177d 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 ()
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c4b4fffd0a6739e8771e4d552d98d21d294a84b
commit 3c4b4fffd0a6739e8771e4d552d98d21d294a84b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 22:17:10 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Jan 26 22:33:33 2012 +0100

    CMakeOnly.AllFindModules: always check FindQt

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)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d72b25a861bdcc69bf08e7494884027c341f7c9
commit 9d72b25a861bdcc69bf08e7494884027c341f7c9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 22:10:31 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Jan 26 22:33:33 2012 +0100

    CMakeOnly.AllFindModules: clean up the Qt3/Qt4 code

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 8a38f06..d28ac01 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -15,25 +15,25 @@ macro(do_find MODULE_NAME)
     find_package(${MODULE_NAME})
 endmacro(do_find)
 
+# It is only possible to use either Qt3 or Qt4 in one project.
+# 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")
+
 foreach(FIND_MODULE ${FIND_MODULES})
     string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}")
 
-    # It is only possible to use either Qt3 or Qt4 in one project.
-    # 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
-
-    if (NOT MODULE_NAME STREQUAL "Qt" AND
-        NOT MODULE_NAME STREQUAL "Qt3" AND
-        NOT MODULE_NAME STREQUAL "KDE3")
+    list(FIND NO_QT4_MODULES ${MODULE_NAME} NO_QT4_INDEX)
+    if (NO_QT4_INDEX EQUAL -1)
         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")
+if (NOT QT4_FOUND)
+    foreach(FIND_MODULE ${NO_QT4_MODULES})
         do_find(${FIND_MODULE})
     endforeach(FIND_MODULE)
-endif(NOT QT4_FOUND)
+endif (NOT QT4_FOUND)

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeOnly/AllFindModules/CMakeLists.txt |   29 +++++++++++++++---------
 1 files changed, 18 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list