[Cmake-commits] CMake branch, next, updated. v2.8.7-2398-g25e5396

[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  25e5396b37b55da97d992f11754da5413c024226 (commit)
       via  ed1b12624dfe7f4b6afeb557aabb091904918bc7 (commit)
      from  28009fadac1ed04cb437fd6d13d33fe2ffa37aa0 (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=25e5396b37b55da97d992f11754da5413c024226
commit 25e5396b37b55da97d992f11754da5413c024226
Merge: 28009fa ed1b126
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Feb 1 12:12:37 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 1 12:12:37 2012 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed1b12624dfe7f4b6afeb557aabb091904918bc7
commit ed1b12624dfe7f4b6afeb557aabb091904918bc7
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: Wed Feb 1 18:12:19 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..127e9d7 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_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()
+        elseif (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()
+        else()
+            message(SEND_ERROR "${VTEST}_FOUND is set but no version number is defined")
+        endif()
+    endif(${VTEST}_FOUND)
+endforeach(VTEST)

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

Summary of changes:


hooks/post-receive
-- 
CMake