[Cmake-commits] CMake branch, next, updated. v2.8.7-2331-g187be12

[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  187be120d684d5bf5364533737fd6100d540dd5e (commit)
       via  93fcefe294ccf3b52e7d65621e362152bd7eece7 (commit)
       via  164701c995e20c4d6efefc9a2d4fe23fe8c22555 (commit)
      from  69d8b72746c407c0133df973c3bcbb52ac228e66 (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=187be120d684d5bf5364533737fd6100d540dd5e
commit 187be120d684d5bf5364533737fd6100d540dd5e
Merge: 69d8b72 93fcefe
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jan 28 03:31:09 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 28 03:31:09 2012 -0500

    Merge topic 'version-extra-debugging' into next
    
    93fcefe do not require GnuTLS version, but Gnuplot
    164701c relax regex to allow "1.7.2.3.msysgit.0"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93fcefe294ccf3b52e7d65621e362152bd7eece7
commit 93fcefe294ccf3b52e7d65621e362152bd7eece7
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jan 28 09:30:04 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jan 28 09:30:04 2012 +0100

    do not require GnuTLS version, but Gnuplot

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index f1cb53c..7694a49 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -48,7 +48,7 @@ endif (NOT QT4_FOUND)
 # If any of these modules reported that it was found a version number should have been
 # reported.
 set(VERSIONS_REQUIRED
-    BISON BZIP2 CUPS CURL DOXYGEN EXPAT FLEX GETTEXT GIF GIT GNUTLS
+    BISON BZIP2 CUPS CURL DOXYGEN EXPAT FLEX GETTEXT GIF GIT GNUPLOT
     LIBXML2 PERL PostgreSQL SWIG ZLIB)
 
 foreach(VTEST ${VERSIONS_REQUIRED})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=164701c995e20c4d6efefc9a2d4fe23fe8c22555
commit 164701c995e20c4d6efefc9a2d4fe23fe8c22555
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jan 28 09:05:15 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jan 28 09:06:48 2012 +0100

    relax regex to allow "1.7.2.3.msysgit.0"

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 0bc7d54..f1cb53c 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -54,11 +54,11 @@ set(VERSIONS_REQUIRED
 foreach(VTEST ${VERSIONS_REQUIRED})
     if (${VTEST}_FOUND)
         if (DEFINED ${VTEST}_VERSION)
-            if (NOT ${VTEST}_VERSION MATCHES "^[0-9]([0-9A-Za-z\\.]*)$")
+            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]*$")
+            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()

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

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


hooks/post-receive
-- 
CMake