[Cmake-commits] CMake branch, next, updated. v2.8.7-2381-g4636aa6

[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  4636aa6cf53b91fc13d5f7e038681646a139e730 (commit)
       via  461c180ff573a929128e6b72d66597153331371b (commit)
      from  79d5d042c4ca3a1e52df4bc0912d900ebc2bb0a4 (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=4636aa6cf53b91fc13d5f7e038681646a139e730
commit 4636aa6cf53b91fc13d5f7e038681646a139e730
Merge: 79d5d04 461c180
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 31 15:29:56 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 15:29:56 2012 -0500

    Merge topic 'perl-version' into next
    
    461c180 FindPerl: another try for the IRIX perl


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=461c180ff573a929128e6b72d66597153331371b
commit 461c180ff573a929128e6b72d66597153331371b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 31 21:29:32 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 31 21:29:32 2012 +0100

    FindPerl: another try for the IRIX perl

diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake
index d5af175..ae686df 100644
--- a/Modules/FindPerl.cmake
+++ b/Modules/FindPerl.cmake
@@ -64,6 +64,8 @@ IF(PERL_EXECUTABLE)
     )
     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})
+    ELSEIF(NOT PERL_VERSION_RESULT_VARIABLE AND PERL_VERSION_OUTPUT_VARIABLE MATCHES "This is perl, version ([0-9\\._]+) +")
+      STRING(REGEX REPLACE ".*This is perl, version ([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, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake