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 26802fe7ed853606a8292b1983ee9bb0726f8a48 (commit)
via bf28ff1f422407f10ecc283f03ce8c5ee57f1812 (commit)
from d8808544f282ba320c32d941ad3859127cdae5ae (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=26802fe7ed853606a8292b1983ee9bb0726f8a48
commit 26802fe7ed853606a8292b1983ee9bb0726f8a48
Merge: d880854 bf28ff1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 5 12:01:16 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Mar 5 12:01:16 2014 -0500
Merge topic 'different-python-header-libs-exe-0013794' into next
bf28ff1f FindPythonLibs: Do not try to find the interpreter (#13794)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf28ff1f422407f10ecc283f03ce8c5ee57f1812
commit bf28ff1f422407f10ecc283f03ce8c5ee57f1812
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 5 11:57:00 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Mar 5 11:58:13 2014 -0500
FindPythonLibs: Do not try to find the interpreter (#13794)
The parent commit taught FindPythonLibs to try to find PythonInterp
unconditionally. Some projects may want the libraries of a specific
version even when the corresponding interpreter is not available. Drop
the internal use of FindPythonInterp and just use the versions from it
if it happens to have been found by the project first. That will allow
projects to get a consistent version when they want both but not
otherwise force them to find the interpreter.
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 27d9e45..656ed7b 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -83,7 +83,6 @@ endif()
# If FindPythonInterp has already found the major and minor version,
# insert that version between the user supplied versions and the stock
# version list.
-find_package(PythonInterp QUIET)
set(_Python_VERSIONS ${Python_ADDITIONAL_VERSIONS})
if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR)
list(APPEND _Python_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPythonLibs.cmake | 1 -
1 file changed, 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
