[Cmake-commits] CMake branch, next, updated. v2.8.7-2355-gc4fb13b

[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  c4fb13be2b1ae85388cb15b203196b4750e054c9 (commit)
       via  7b87bfb1d8400328ff45f9603a99143829c2f991 (commit)
      from  d2138ac978977b08bfa4f77aef27880298dd1057 (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=c4fb13be2b1ae85388cb15b203196b4750e054c9
commit c4fb13be2b1ae85388cb15b203196b4750e054c9
Merge: d2138ac 7b87bfb
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jan 29 15:13:08 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 29 15:13:08 2012 -0500

    Merge topic 'version-extra-debugging' into next
    
    7b87bfb allow underscores in version number, at least Perl has it


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b87bfb1d8400328ff45f9603a99143829c2f991
commit 7b87bfb1d8400328ff45f9603a99143829c2f991
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jan 29 21:01:55 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Jan 29 21:01:55 2012 +0100

    allow underscores in version number, at least Perl has it

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 0756250..468472b 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-9\\.]*[A-Za-z]*[0-9\\.]*$")
+            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\\.]*$")
+            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 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake