[Cmake-commits] CMake branch, next, updated. v2.8.7-2315-gd03b554

Rolf Eike Beer eike at sf-mail.de
Fri Jan 27 14:43:14 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  d03b554719ba04e8bc0465baf605ef92aded7084 (commit)
       via  9408fcfb41168a43e94e44c4ceda0a023642ddd1 (commit)
      from  32fdc83d1861a7ea2fb1997ce9d132a7f6a7bc15 (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=d03b554719ba04e8bc0465baf605ef92aded7084
commit d03b554719ba04e8bc0465baf605ef92aded7084
Merge: 32fdc83 9408fcf
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 14:43:09 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 14:43:09 2012 -0500

    Merge topic 'version-extra-debugging' into next
    
    9408fcf collect sample of "python -V" output


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

    collect sample of "python -V" output

diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 96aeee4..749e75f 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -97,7 +97,7 @@ if(PYTHON_EXECUTABLE)
             string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" PYTHON_VERSION_PATCH "${PYTHON_VERSION_STRING}")
         endif()
 else()
-execute_process(COMMAND "${PYTHON_EXECUTABLE}" -h OUTPUT_VARIABLE _DBG_OUT ERROR_VARIABLE _DBG_ERR ERROR_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND "${PYTHON_EXECUTABLE}" -V OUTPUT_VARIABLE _DBG_OUT ERROR_VARIABLE _DBG_ERR ERROR_STRIP_TRAILING_WHITESPACE)
 message(AUTHOR_WARNING "Module Version ##DEBUGGING##\nraw python output was: '${_VERSION}'\npython -h output was '${_DBG_OUT}'\npython -h error output was '${_DBG_ERR}'")
     endif()
 endif(PYTHON_EXECUTABLE)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list