[Cmake-commits] CMake branch, next, updated. v2.8.7-2886-g44d1428

[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  44d142836b8c6e397156365be45dbf1bb3122c6e (commit)
       via  092ddf9698a03e0d4aa083cd2b8442c6edee62a1 (commit)
      from  7910f5325a4b0b448cd625b1e240f21484b29c51 (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=44d142836b8c6e397156365be45dbf1bb3122c6e
commit 44d142836b8c6e397156365be45dbf1bb3122c6e
Merge: 7910f53 092ddf9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Feb 26 03:17:45 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 26 03:17:45 2012 -0500

    Merge topic 'debug-findpythoninterp-version' into next
    
    092ddf9 Revert "FindPythonInterp: add debug code for version detection"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=092ddf9698a03e0d4aa083cd2b8442c6edee62a1
commit 092ddf9698a03e0d4aa083cd2b8442c6edee62a1
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Feb 26 09:17:09 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Feb 26 09:17:09 2012 +0100

    Revert "FindPythonInterp: add debug code for version detection"
    
    This reverts commit fcb79c582094c867e7b841fe8ec7f2c6ee07b85e.

diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index c450405..5c1d56b 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -89,18 +89,15 @@ endif()
 # determine python version string
 if(PYTHON_EXECUTABLE)
     execute_process(COMMAND "${PYTHON_EXECUTABLE}" --version
-                    OUTPUT_VARIABLE _VERSION_O
                     ERROR_VARIABLE _VERSION
                     RESULT_VARIABLE _PYTHON_VERSION_RESULT
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
+                    OUTPUT_QUIET
                     ERROR_STRIP_TRAILING_WHITESPACE)
     if(_PYTHON_VERSION_RESULT)
-message(STATUS "'python --version' process result is ${_PYTHON_VERSION_RESULT}, stdout is '${_VERSION_O}', stderr is '${_VERSION}'")
         execute_process(COMMAND "${PYTHON_EXECUTABLE}" -V
-                       OUTPUT_VARIABLE _VERSION_O
                         ERROR_VARIABLE _VERSION
                         RESULT_VARIABLE _PYTHON_VERSION_RESULT
-                        OUTPUT_STRIP_TRAILING_WHITESPACE
+                        OUTPUT_QUIET
                         ERROR_STRIP_TRAILING_WHITESPACE)
     endif(_PYTHON_VERSION_RESULT)
     if(NOT _PYTHON_VERSION_RESULT AND _VERSION MATCHES "^Python [0-9]+\\.[0-9]+.*")
@@ -110,8 +107,6 @@ message(STATUS "'python --version' process result is ${_PYTHON_VERSION_RESULT},
         if(PYTHON_VERSION_STRING MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+.*")
             string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" PYTHON_VERSION_PATCH "${PYTHON_VERSION_STRING}")
         endif()
-else()
-message(STATUS "process result is ${_PYTHON_VERSION_RESULT}, stdout is '${_VERSION_O}', stderr is '${_VERSION}'")
     endif()
     unset(_PYTHON_VERSION_RESULT)
     unset(_VERSION)

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

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


hooks/post-receive
-- 
CMake