diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-03 18:59:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-03 19:00:03 (GMT) |
| commit | 5f04dfe57ebf1abee29101228844ebaa721356a2 (patch) | |
| tree | ceefc2680aa1d948dd881d74dd670b586cc627f6 /Help/manual/cmake-variables.7.rst | |
| parent | 25bf64eca639dff012f47a74a73d1af2b2e4d9c6 (diff) | |
| parent | b966f86d8637a61e9a829eeee6ed911c5245cae1 (diff) | |
| download | CMake-5f04dfe57ebf1abee29101228844ebaa721356a2.zip CMake-5f04dfe57ebf1abee29101228844ebaa721356a2.tar.gz CMake-5f04dfe57ebf1abee29101228844ebaa721356a2.tar.bz2 | |
Merge topic 'ninja-multi-variable-shuffle'
b966f86d86 Ninja Multi-Config: Shuffle variables around
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4305
Diffstat (limited to 'Help/manual/cmake-variables.7.rst')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 5697574..1023a66 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -428,10 +428,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 |