[Cmake-commits] CMake branch, next, updated. v2.8.7-2307-gdde0e45

Rolf Eike Beer eike at sf-mail.de
Fri Jan 27 11:56:29 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  dde0e456360c35150d79c4e30228ab90f1f3056b (commit)
       via  efe890fc694443df1602efed8d3c5a1bf4017ec5 (commit)
      from  0d7524a2fb7107227187d218c68db16409bb6409 (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=dde0e456360c35150d79c4e30228ab90f1f3056b
commit dde0e456360c35150d79c4e30228ab90f1f3056b
Merge: 0d7524a efe890f
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 11:56:27 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 11:56:27 2012 -0500

    Merge topic 'perl-version' into next
    
    efe890f FindPerl: try harder to get a version number


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efe890fc694443df1602efed8d3c5a1bf4017ec5
commit efe890fc694443df1602efed8d3c5a1bf4017ec5
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 17:18:52 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 27 17:18:52 2012 +0100

    FindPerl: try harder to get a version number

diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake
index 4ccb76c..f88cbe2 100644
--- a/Modules/FindPerl.cmake
+++ b/Modules/FindPerl.cmake
@@ -54,6 +54,17 @@ IF(PERL_EXECUTABLE)
   )
   IF(NOT PERL_VERSION_RESULT_VARIABLE)
     STRING(REGEX REPLACE "version='([^']+)'.*" "\\1" PERL_VERSION_STRING ${PERL_VERSION_OUTPUT_VARIABLE})
+  ELSE(NOT PERL_VERSION_RESULT_VARIABLE)
+    EXECUTE_PROCESS(
+      COMMAND ${PERL_EXECUTABLE} -v
+      OUTPUT_VARIABLE PERL_VERSION_OUTPUT_VARIABLE
+      RESULT_VARIABLE PERL_VERSION_RESULT_VARIABLE
+      ERROR_QUIET
+      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})
+    ENDIF()
   ENDIF(NOT PERL_VERSION_RESULT_VARIABLE)
 ENDIF(PERL_EXECUTABLE)
 

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list