[Cmake-commits] CMake branch, next, updated. v2.8.7-2363-g9b6c0a9

Rolf Eike Beer eike at sf-mail.de
Mon Jan 30 13:37:46 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  9b6c0a984b39e6b4bc7f052a6e7d355ebf743390 (commit)
       via  f4e7ca3b9f318530a9399205b05ed57ae96f05ee (commit)
      from  719d9f71f44dfd4352104900b28095129c6c43e0 (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=9b6c0a984b39e6b4bc7f052a6e7d355ebf743390
commit 9b6c0a984b39e6b4bc7f052a6e7d355ebf743390
Merge: 719d9f7 f4e7ca3
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 30 13:37:42 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 13:37:42 2012 -0500

    Merge topic 'AllFindModules-test' into next
    
    f4e7ca3 CMakeOnly.AllFindModules: require version for some modules


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4e7ca3b9f318530a9399205b05ed57ae96f05ee
commit f4e7ca3b9f318530a9399205b05ed57ae96f05ee
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 30 19:25:07 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 30 19:37:10 2012 +0100

    CMakeOnly.AllFindModules: require version for some modules

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 308177d..468472b 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -44,3 +44,25 @@ if (NOT QT4_FOUND)
         do_find(${FIND_MODULE})
     endforeach(FIND_MODULE)
 endif (NOT QT4_FOUND)
+
+# If any of these modules reported that it was found a version number should have been
+# reported.
+set(VERSIONS_REQUIRED
+    ALSA BISON BZIP2 CUPS CURL DOXYGEN EXPAT FLEX GETTEXT GIF GIT GNUPLOT
+    ImageMagick JASPER LibArchive LIBXML2 PERL PostgreSQL SWIG TIFF ZLIB)
+
+foreach(VTEST ${VERSIONS_REQUIRED})
+    if (${VTEST}_FOUND)
+        if (DEFINED ${VTEST}_VERSION)
+            if (NOT ${VTEST}_VERSION MATCHES "^[0-9][0-9\\.]*[A-Za-z_]*[0-9\\.]*$")
+                message(SEND_ERROR "${VTEST}_VERSION has unexpected content ${${VTEST}_VERSION}")
+            endif()
+        elseif (DEFINED ${VTEST}_VERSION_STRING)
+            if (NOT ${VTEST}_VERSION_STRING MATCHES "^[0-9][0-9\\.]*[A-Za-z_]*[0-9\\.]*$")
+                message(SEND_ERROR "${VTEST}_VERSION_STRING has unexpected content ${${VTEST}_VERSION_STRING}")
+            endif()
+        else()
+            message(SEND_ERROR "${VTEST}_FOUND is set but no version number is defined")
+        endif()
+    endif(${VTEST}_FOUND)
+endforeach(VTEST)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list