[Cmake-commits] CMake branch, next, updated. v2.8.7-2868-gbaf4710
Rolf Eike Beer
eike at sf-mail.de
Sat Feb 25 09:01:22 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 baf47101466b23d2c7544d67133d8709caf84963 (commit)
via fcb79c582094c867e7b841fe8ec7f2c6ee07b85e (commit)
from c06351d0776addf68a1a5277d14fcc74e763e6c7 (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=baf47101466b23d2c7544d67133d8709caf84963
commit baf47101466b23d2c7544d67133d8709caf84963
Merge: c06351d fcb79c5
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Feb 25 09:01:19 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 25 09:01:19 2012 -0500
Merge topic 'debug-findpythoninterp-version' into next
fcb79c5 FindPythonInterp: add debug code for version detection
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcb79c582094c867e7b841fe8ec7f2c6ee07b85e
commit fcb79c582094c867e7b841fe8ec7f2c6ee07b85e
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Feb 25 14:56:28 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Feb 25 15:00:20 2012 +0100
FindPythonInterp: add debug code for version detection
magrathea.kitware doesn't have a version number in the nightly tests. Let's
find out what's wrong there.
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 5c1d56b..c450405 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -89,15 +89,18 @@ 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_QUIET
+ OUTPUT_STRIP_TRAILING_WHITESPACE
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_QUIET
+ OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE)
endif(_PYTHON_VERSION_RESULT)
if(NOT _PYTHON_VERSION_RESULT AND _VERSION MATCHES "^Python [0-9]+\\.[0-9]+.*")
@@ -107,6 +110,8 @@ if(PYTHON_EXECUTABLE)
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, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list