[Cmake-commits] CMake branch, next, updated. v2.8.7-2353-gd2138ac

Rolf Eike Beer eike at sf-mail.de
Sun Jan 29 04:04:05 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  d2138ac978977b08bfa4f77aef27880298dd1057 (commit)
       via  5a5bd6bf470df5f2a04a422e2a91c42ff051db01 (commit)
      from  9ed60e71797f0d05da0dcec616821ce302c64310 (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=d2138ac978977b08bfa4f77aef27880298dd1057
commit d2138ac978977b08bfa4f77aef27880298dd1057
Merge: 9ed60e7 5a5bd6b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jan 29 04:04:01 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 29 04:04:01 2012 -0500

    Merge topic 'perl-version' into next
    
    5a5bd6b FindPerl: allow underscores in the version number


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a5bd6bf470df5f2a04a422e2a91c42ff051db01
commit 5a5bd6bf470df5f2a04a422e2a91c42ff051db01
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jan 29 10:03:32 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Jan 29 10:03:32 2012 +0100

    FindPerl: allow underscores in the version number
    
    This is needed e.g. on the IRIX machine which writes:
    
    This is perl, version 5.004_05 built for irix-n32

diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake
index e71410c..06cbc63 100644
--- a/Modules/FindPerl.cmake
+++ b/Modules/FindPerl.cmake
@@ -63,7 +63,7 @@ IF(PERL_EXECUTABLE)
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     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})
+      STRING(REGEX REPLACE ".*This is perl.*[ \\(]v([0-9\\._]+)[ \\)].*" "\\1" PERL_VERSION_STRING ${PERL_VERSION_OUTPUT_VARIABLE})
     ENDIF()
   ENDIF()
 ENDIF(PERL_EXECUTABLE)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list