[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-335-gc8d860b
Brad King
brad.king at kitware.com
Mon Mar 7 11:01:40 EST 2016
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 c8d860b991a73dd5206125b747ccda87aa68c0d2 (commit)
via 743f2a803143e8947df007048bdd3780722ead58 (commit)
from 365fb19ffc683351fff43b06d19f3834e8468b35 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8d860b991a73dd5206125b747ccda87aa68c0d2
commit c8d860b991a73dd5206125b747ccda87aa68c0d2
Merge: 365fb19 743f2a8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 7 11:01:39 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 7 11:01:39 2016 -0500
Merge topic 'doc-find-python-call-order' into next
743f2a80 FindPython{Interp,Libs}: Clarify recommended call order
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=743f2a803143e8947df007048bdd3780722ead58
commit 743f2a803143e8947df007048bdd3780722ead58
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 7 10:56:31 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 7 10:56:31 2016 -0500
FindPython{Interp,Libs}: Clarify recommended call order
Improve wording in our advice about how to call both of these modules.
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 879192e..e194185 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -28,9 +28,10 @@
# 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.
+# If calling both ``find_package(PythonInterp)`` and
+# ``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.
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 68e1228..ab92f86 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -32,9 +32,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.
+# If calling both ``find_package(PythonInterp)`` and
+# ``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 2001-2009 Kitware, Inc.
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPythonInterp.cmake | 7 ++++---
Modules/FindPythonLibs.cmake | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list