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 216fb9d9d1835cfb658686ddbe7bface46f7639a (commit) via 9589c70b0b89f462b6325c815963c118cb1e16e1 (commit) from e8803698fd37ad214347df5939c267548d77eb07 (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=216fb9d9d1835cfb658686ddbe7bface46f7639a commit 216fb9d9d1835cfb658686ddbe7bface46f7639a Merge: e880369 9589c70 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Mar 13 15:14:23 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Mar 13 15:14:23 2014 -0400 Merge topic 'different-python-header-libs-exe-0013794' into next 9589c70b FindPythonInterp: Document instead of warn find_package order. (#13794) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9589c70b0b89f462b6325c815963c118cb1e16e1 commit 9589c70b0b89f462b6325c815963c118cb1e16e1 Author: Matt McCormick <matt.mccorm...@kitware.com> AuthorDate: Thu Mar 13 11:19:11 2014 -0400 Commit: Matt McCormick <matt.mccorm...@kitware.com> CommitDate: Thu Mar 13 11:22:32 2014 -0400 FindPythonInterp: Document instead of warn find_package order. (#13794) Document in both FindPythonInterp.cmake and FindPythonLibs.cmake that find_package(PythonInterp) should be called before find_package(PythonLibs). This prevents warnings when a project does find_package(PythonInterp) find_package(PythonLibs) then later another find_package(PythonInterp) Suggested-by: Brad King <brad.k...@kitware.com> diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake index 9a2dbcc..f8ff5d8 100644 --- a/Modules/FindPythonInterp.cmake +++ b/Modules/FindPythonInterp.cmake @@ -27,6 +27,10 @@ # of version numbers that should be taken into account when searching # for Python. You need to set this variable before calling # find_package(PythonInterp). +# +# If also calling find_package(PythonLibs), call find_package(PythonInterp) +# first to get the currently active Python version by default with a consistent +# version of PYTHON_LIBRARIES. #============================================================================= # Copyright 2005-2010 Kitware, Inc. @@ -84,7 +88,6 @@ if(DEFINED PYTHONLIBS_VERSION_STRING) list(GET _PYTHONLIBS_VERSION 0 _PYTHONLIBS_VERSION_MAJOR) list(GET _PYTHONLIBS_VERSION 1 _PYTHONLIBS_VERSION_MINOR) list(APPEND _Python_VERSIONS ${_PYTHONLIBS_VERSION_MAJOR}.${_PYTHONLIBS_VERSION_MINOR}) - message(AUTHOR_WARNING "Call find_package(PythonInterp) before find_package(PythonLibs) to get the currently active Python version by default.") endif() # Search for the current active python version first list(APPEND _Python_VERSIONS ";") diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index 656ed7b..1f90f5b 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -31,6 +31,10 @@ # # PYTHON_LIBRARY - path to the python library # PYTHON_INCLUDE_DIR - path to where Python.h is found +# +# If also calling find_package(PythonInterp), call find_package(PythonInterp) +# first to get the currently active Python version by default with a consistent +# version of PYTHON_LIBRARIES. #============================================================================= # Copyright 2001-2009 Kitware, Inc. ----------------------------------------------------------------------- Summary of changes: Modules/FindPythonInterp.cmake | 5 ++++- Modules/FindPythonLibs.cmake | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits