[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3833-gc32a4f4

[Rolf Eike Beer]

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  c32a4f4658a3dfbe8afc5e5fa50064a33058cc80 (commit)
       via  796c618cccf9bc1887ff3ca297d3f69fce0fcb75 (commit)
      from  d05a8d19e5cb3983cc215eb6b375f929b8716b13 (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=c32a4f4658a3dfbe8afc5e5fa50064a33058cc80
commit c32a4f4658a3dfbe8afc5e5fa50064a33058cc80
Merge: d05a8d1 796c618
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Aug 9 14:35:15 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 9 14:35:15 2013 -0400

    Merge topic 'no-duplicate-find-tests' into next
    
    796c618 blacklist tests with their own test in Tests/Module from AllFindModules test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=796c618cccf9bc1887ff3ca297d3f69fce0fcb75
commit 796c618cccf9bc1887ff3ca297d3f69fce0fcb75
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Aug 9 20:34:29 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Aug 9 20:34:29 2013 +0200

    blacklist tests with their own test in Tests/Module from AllFindModules test

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 739593c..691728a 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -22,11 +22,18 @@ endmacro()
 set(DESIRED_QT_VERSION 4)
 set(NO_QT4_MODULES "Qt3" "KDE3")
 
+# ignore everything that has it's own test in Tests/Module/
+file(GLOB OWN_TEST_MODULES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../../Module/" "${CMAKE_CURRENT_SOURCE_DIR}/../../Module/Find*")
+foreach(FIND_MODULE IN LISTS OWN_TEST_MODULES)
+    string(REGEX REPLACE "^Find" "" _MOD_NAME "${FIND_MODULE}")
+    list(APPEND NO_FIND_MODULES "${_MOD_NAME}")
+endforeach()
+
 # These modules are named Find*.cmake, but are nothing that works in
 # find_package().
-set(NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage")
+list(APPEND NO_FIND_MODULES "PackageHandleStandardArgs" "PackageMessage")
 
-foreach(FIND_MODULE ${FIND_MODULES})
+foreach(FIND_MODULE IN LISTS FIND_MODULES)
     string(REGEX REPLACE ".*/Find(.*)\\.cmake$" "\\1" MODULE_NAME "${FIND_MODULE}")
 
     list(FIND NO_QT4_MODULES ${MODULE_NAME} NO_QT4_INDEX)

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

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


hooks/post-receive
-- 
CMake