diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-21 14:01:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-21 14:01:52 (GMT) |
| commit | a13cfa246fee1ba99eeecda8b8e8d158d29841df (patch) | |
| tree | 32fe0446e2b5e5993c0612964929ec8aee4d6538 /Help | |
| parent | 3946cbc505a066677efe1faea3cc2d051b1132bc (diff) | |
| parent | 50b5e9ed1316f82976a45c5fb2b00d0d3a3e4438 (diff) | |
| download | CMake-a13cfa246fee1ba99eeecda8b8e8d158d29841df.zip CMake-a13cfa246fee1ba99eeecda8b8e8d158d29841df.tar.gz CMake-a13cfa246fee1ba99eeecda8b8e8d158d29841df.tar.bz2 | |
Merge topic 'FindPython-new-implementation'
50b5e9ed13 CMake build: Use new FindPython module
352baee207 FindPython*: New implementation for Python stuff
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !1819
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-developer.7.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-modules.7.rst | 3 | ||||
| -rw-r--r-- | Help/module/FindPython.rst | 1 | ||||
| -rw-r--r-- | Help/module/FindPython2.rst | 1 | ||||
| -rw-r--r-- | Help/module/FindPython3.rst | 1 | ||||
| -rw-r--r-- | Help/release/dev/FindPython-new-implementation.rst | 5 |
6 files changed, 13 insertions, 0 deletions
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst index 41fe90c..32e8cfc 100644 --- a/Help/manual/cmake-developer.7.rst +++ b/Help/manual/cmake-developer.7.rst @@ -644,6 +644,8 @@ Documentation`_ section above. +.. _`CMake Developer Standard Variable Names`: + Standard Variable Names ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index 694bae5..070c6ed 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -196,6 +196,9 @@ All Modules /module/FindPostgreSQL /module/FindProducer /module/FindProtobuf + /module/FindPython + /module/FindPython2 + /module/FindPython3 /module/FindPythonInterp /module/FindPythonLibs /module/FindQt3 diff --git a/Help/module/FindPython.rst b/Help/module/FindPython.rst new file mode 100644 index 0000000..057a350 --- /dev/null +++ b/Help/module/FindPython.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/FindPython.cmake diff --git a/Help/module/FindPython2.rst b/Help/module/FindPython2.rst new file mode 100644 index 0000000..1696bed --- /dev/null +++ b/Help/module/FindPython2.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/FindPython2.cmake diff --git a/Help/module/FindPython3.rst b/Help/module/FindPython3.rst new file mode 100644 index 0000000..e530ab8 --- /dev/null +++ b/Help/module/FindPython3.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/FindPython3.cmake diff --git a/Help/release/dev/FindPython-new-implementation.rst b/Help/release/dev/FindPython-new-implementation.rst new file mode 100644 index 0000000..22051d0 --- /dev/null +++ b/Help/release/dev/FindPython-new-implementation.rst @@ -0,0 +1,5 @@ +FindPython(2|3) +--------------- + +* The new :module:`FindPython3` and :module:`FindPython2` modules, as well as + :module:`FindPython`, provide a new way to locate python environments. |