summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2019-11-27 16:58:02 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2019-12-13 15:52:07 (GMT)
commit8c062f9d9986560588bbc5b7cffbbf3de940cc02 (patch)
tree82c2f2de0c29fae4d57970a71edb7446066504a0 /Help/manual
parente0478cc64623fbfcb7dcd748f27b94cc8473fa1a (diff)
downloadCMake-8c062f9d9986560588bbc5b7cffbbf3de940cc02.zip
CMake-8c062f9d9986560588bbc5b7cffbbf3de940cc02.tar.gz
CMake-8c062f9d9986560588bbc5b7cffbbf3de940cc02.tar.bz2
Help: Add documentation and release notes for multi-config Ninja
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-generators.7.rst5
-rw-r--r--Help/manual/cmake-variables.7.rst1
2 files changed, 4 insertions, 2 deletions
diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst
index 41f7652..6f88c0a 100644
--- a/Help/manual/cmake-generators.7.rst
+++ b/Help/manual/cmake-generators.7.rst
@@ -52,13 +52,14 @@ Makefile Generators
/generator/Unix Makefiles
/generator/Watcom WMake
-Ninja Generator
-^^^^^^^^^^^^^^^
+Ninja Generators
+^^^^^^^^^^^^^^^^
.. toctree::
:maxdepth: 1
/generator/Ninja
+ /generator/Ninja Multi-Config
.. _`IDE Build Tool Generators`:
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 7a5e83e..5143124 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -214,6 +214,7 @@ Variables that Change Behavior
/variable/CMAKE_MESSAGE_INDENT
/variable/CMAKE_MESSAGE_LOG_LEVEL
/variable/CMAKE_MODULE_PATH
+ /variable/CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE
/variable/CMAKE_POLICY_DEFAULT_CMPNNNN
/variable/CMAKE_POLICY_WARNING_CMPNNNN
/variable/CMAKE_PREFIX_PATH