summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2020-01-29 22:43:28 (GMT)
committerBrad King <brad.king@kitware.com>2020-02-03 18:27:51 (GMT)
commitb966f86d8637a61e9a829eeee6ed911c5245cae1 (patch)
tree5c1773f4b78013ab22ff16287c40fa285b8d9826 /Help/manual
parentfeea34e7eb483e8db28947920757612a95ab1863 (diff)
downloadCMake-b966f86d8637a61e9a829eeee6ed911c5245cae1.zip
CMake-b966f86d8637a61e9a829eeee6ed911c5245cae1.tar.gz
CMake-b966f86d8637a61e9a829eeee6ed911c5245cae1.tar.bz2
Ninja Multi-Config: Shuffle variables around
Remove redundant variable CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE. Rename other variables. Document and improve handling of error conditions.
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-variables.7.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 63deda5..ef6fa01 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -426,10 +426,9 @@ Variables that Control the Build
/variable/CMAKE_MODULE_LINKER_FLAGS_INIT
/variable/CMAKE_MSVCIDE_RUN_PATH
/variable/CMAKE_MSVC_RUNTIME_LIBRARY
- /variable/CMAKE_NINJA_MULTI_CROSS_CONFIGS
- /variable/CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE
- /variable/CMAKE_NINJA_MULTI_DEFAULT_BUILD_ALIAS
- /variable/CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE
+ /variable/CMAKE_NMC_CROSS_CONFIGS
+ /variable/CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG
+ /variable/CMAKE_NMC_DEFAULT_CONFIGS
/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX
/variable/CMAKE_NO_BUILTIN_CHRPATH
/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED