diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-07 16:03:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-07 16:03:50 (GMT) |
| commit | 0e02c69170ab46619c6bd7a4b027929272e0a9c5 (patch) | |
| tree | e3132584059b49fa51da4f1895993abc315a1a9f /Modules | |
| parent | 15a4afe47a2871b97ae44e0ecbd8623a372a906e (diff) | |
| parent | 743f2a803143e8947df007048bdd3780722ead58 (diff) | |
| download | CMake-0e02c69170ab46619c6bd7a4b027929272e0a9c5.zip CMake-0e02c69170ab46619c6bd7a4b027929272e0a9c5.tar.gz CMake-0e02c69170ab46619c6bd7a4b027929272e0a9c5.tar.bz2 | |
Merge branch 'doc-find-python-call-order' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindPythonInterp.cmake | 7 | ||||
| -rw-r--r-- | Modules/FindPythonLibs.cmake | 7 |
2 files changed, 8 insertions, 6 deletions
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. |