[Cmake-commits] CMake branch, next, updated. v2.8.7-2333-g37cfa0e

[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  37cfa0e8cce184a6aec5620feb9d1522c117ac65 (commit)
       via  84e5c1424f1dac4c32d98b33ac411e101ccb32bc (commit)
      from  187be120d684d5bf5364533737fd6100d540dd5e (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=37cfa0e8cce184a6aec5620feb9d1522c117ac65
commit 37cfa0e8cce184a6aec5620feb9d1522c117ac65
Merge: 187be12 84e5c14
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jan 28 03:32:06 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 28 03:32:06 2012 -0500

    Merge topic 'perl-version' into next
    
    84e5c14 FindPerl: catch another missing version number


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84e5c1424f1dac4c32d98b33ac411e101ccb32bc
commit 84e5c1424f1dac4c32d98b33ac411e101ccb32bc
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jan 28 09:20:25 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jan 28 09:20:25 2012 +0100

    FindPerl: catch another missing version number

diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake
index f88cbe2..e71410c 100644
--- a/Modules/FindPerl.cmake
+++ b/Modules/FindPerl.cmake
@@ -52,9 +52,9 @@ IF(PERL_EXECUTABLE)
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  IF(NOT PERL_VERSION_RESULT_VARIABLE)
+  IF(NOT PERL_VERSION_RESULT_VARIABLE AND NOT PERL_VERSION_OUTPUT_VARIABLE MATCHES "^version='UNKNOWN'")
     STRING(REGEX REPLACE "version='([^']+)'.*" "\\1" PERL_VERSION_STRING ${PERL_VERSION_OUTPUT_VARIABLE})
-  ELSE(NOT PERL_VERSION_RESULT_VARIABLE)
+  ELSE()
     EXECUTE_PROCESS(
       COMMAND ${PERL_EXECUTABLE} -v
       OUTPUT_VARIABLE PERL_VERSION_OUTPUT_VARIABLE
@@ -65,7 +65,7 @@ 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})
     ENDIF()
-  ENDIF(NOT PERL_VERSION_RESULT_VARIABLE)
+  ENDIF()
 ENDIF(PERL_EXECUTABLE)
 
 # Deprecated settings for compatibility with CMake1.4

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

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


hooks/post-receive
-- 
CMake