[Cmake-commits] CMake branch, next, updated. v2.8.7-2357-g155a114

[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  155a1147cb320d318b2feb5b81b56d52d5234b08 (commit)
       via  7f33a88b4e8957638dbd1f8c46ea69ed25105411 (commit)
      from  c4fb13be2b1ae85388cb15b203196b4750e054c9 (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=155a1147cb320d318b2feb5b81b56d52d5234b08
commit 155a1147cb320d318b2feb5b81b56d52d5234b08
Merge: c4fb13b 7f33a88
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 30 13:18:26 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 13:18:26 2012 -0500

    Merge topic 'perl-version' into next
    
    7f33a88 FindPerl: really allow underscores in version number


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

    FindPerl: really allow underscores in version number

diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake
index 06cbc63..d5af175 100644
--- a/Modules/FindPerl.cmake
+++ b/Modules/FindPerl.cmake
@@ -62,7 +62,7 @@ IF(PERL_EXECUTABLE)
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    IF(NOT PERL_VERSION_RESULT_VARIABLE AND PERL_VERSION_OUTPUT_VARIABLE MATCHES "This is perl.*[ \\(]v([0-9\\.]+)[ \\)]")
+    IF(NOT PERL_VERSION_RESULT_VARIABLE AND PERL_VERSION_OUTPUT_VARIABLE MATCHES "This is perl.*[ \\(]v([0-9\\._]+)[ \\)]")
       STRING(REGEX REPLACE ".*This is perl.*[ \\(]v([0-9\\._]+)[ \\)].*" "\\1" PERL_VERSION_STRING ${PERL_VERSION_OUTPUT_VARIABLE})
     ENDIF()
   ENDIF()

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

Summary of changes:
 Modules/FindPerl.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake