[Cmake-commits] CMake branch, next, updated. v2.8.7-2311-g7f0a67d
Rolf Eike Beer
eike at sf-mail.de
Fri Jan 27 13:45:32 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 7f0a67de4d4645d0d7dbc12889fbefda354385f7 (commit)
via 931380940044128ddad77ec771b43e2b2f3bd3bf (commit)
from 72e10102575ab9c3bc24939898e11886e4cb2d1c (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=7f0a67de4d4645d0d7dbc12889fbefda354385f7
commit 7f0a67de4d4645d0d7dbc12889fbefda354385f7
Merge: 72e1010 9313809
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 13:45:20 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 13:45:20 2012 -0500
Merge topic 'version-extra-debugging' into next
9313809 add some more debugging for python that doesn't understand --version
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=931380940044128ddad77ec771b43e2b2f3bd3bf
commit 931380940044128ddad77ec771b43e2b2f3bd3bf
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 19:42:47 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 27 19:44:17 2012 +0100
add some more debugging for python that doesn't understand --version
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 67d4528..96aeee4 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -97,8 +97,8 @@ if(PYTHON_EXECUTABLE)
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" PYTHON_VERSION_PATCH "${PYTHON_VERSION_STRING}")
endif()
else()
-message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
-message(AUTHOR_WARNING "raw python output was: '${_VERSION}'")
+execute_process(COMMAND "${PYTHON_EXECUTABLE}" -h 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 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list