[Cmake-commits] CMake branch, next, updated. v2.8.7-2300-g18cc085

[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  18cc0859794f4aed0761193c756c89d8a0683518 (commit)
       via  0a4ba00fce9c96e30e69fd1a078c3f98139c05d1 (commit)
      from  c110741cdfb878d0496f37a8c5a0260cdbb677a4 (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=18cc0859794f4aed0761193c756c89d8a0683518
commit 18cc0859794f4aed0761193c756c89d8a0683518
Merge: c110741 0a4ba00
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 11:55:10 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 11:55:10 2012 -0500

    Merge topic 'version-extra-debugging' into next
    
    0a4ba00 revert some test code, these issues should be fixed


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

    revert some test code, these issues should be fixed

diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake
index ef935a9..edde9eb 100644
--- a/Modules/FindBISON.cmake
+++ b/Modules/FindBISON.cmake
@@ -77,8 +77,6 @@ IF(BISON_EXECUTABLE)
         BISON_VERSION "${BISON_version_output}")
     ELSE()
       SET(BISON_VERSION "unknown")
-message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
-message(AUTHOR_WARNING "version output was: '${BISON_version_output}'")
     ENDIF()
   ENDIF()
 
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index af5e97d..59efe4b 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -246,13 +246,6 @@ if (OPENSSL_INCLUDE_DIR)
       string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
     endif (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
 
-# debug why there is strange output on one test machine
-if (OPENSSL_VERSION_PATCH_STRING AND NOT OPENSSL_VERSION_PATCH_STRING MATCHES "[a-z]")
-message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
-message(AUTHOR_WARNING "string from header was: '${openssl_version_str}'")
-message(AUTHOR_WARNING "parsed patch version number was: '${OPENSSL_VERSION_PATCH}' ascii num '${OPENSSL_VERSION_PATCH_ASCII}'")
-endif()
-
     set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
   endif (_OPENSSL_VERSION)
 endif (OPENSSL_INCLUDE_DIR)
diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake
index 54b38d4..4ccb76c 100644
--- a/Modules/FindPerl.cmake
+++ b/Modules/FindPerl.cmake
@@ -40,18 +40,6 @@ FIND_PROGRAM(PERL_EXECUTABLE
   PATHS ${PERL_POSSIBLE_BIN_PATHS}
   )
 
-macro(dump_perl_info)
-  foreach(PERL_ARG "-V:version" "-V" "-v" "--version" "-h" "--help")
-    EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} ${PERL_ARG}
-      OUTPUT_VARIABLE PERL_VERSION_OUTPUT_VARIABLE
-      ERROR_VARIABLE PERL_VERSION_ERROR_VARIABLE
-      RESULT_VARIABLE PERL_VERSION_RESULT_VARIABLE)
-message(AUTHOR_WARNING "argument: ${PERL_VARG} result: '${PERL_VERSION_RESULT_VARIABLE}'")
-message(AUTHOR_WARNING "stdout: '${PERL_VERSION_OUTPUT_VARIABLE}'")
-message(AUTHOR_WARNING "stderr: '${PERL_VERSION_ERROR_VARIABLE}'")
-   endforeach(PERL_ARG)
-endmacro(dump_perl_info)
-
 IF(PERL_EXECUTABLE)
   ### PERL_VERSION
   EXECUTE_PROCESS(
@@ -66,14 +54,6 @@ IF(PERL_EXECUTABLE)
   )
   IF(NOT PERL_VERSION_RESULT_VARIABLE)
     STRING(REGEX REPLACE "version='([^']+)'.*" "\\1" PERL_VERSION_STRING ${PERL_VERSION_OUTPUT_VARIABLE})
-if (PERL_VERSION_STRING STREQUAL "UNKNOWN")
-message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
-message(AUTHOR_WARNING "raw perl output was: '${PERL_VERSION_OUTPUT_VARIABLE}'")
-dump_perl_info()
-endif()
-else()
-message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
-dump_perl_info()
   ENDIF(NOT PERL_VERSION_RESULT_VARIABLE)
 ENDIF(PERL_EXECUTABLE)
 

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

Summary of changes:
 Modules/FindBISON.cmake   |    2 --
 Modules/FindOpenSSL.cmake |    7 -------
 Modules/FindPerl.cmake    |   20 --------------------
 3 files changed, 0 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
CMake