diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-17 14:38:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-17 14:39:32 (GMT) |
| commit | 796d66438bce2a46235642767d0614c158723738 (patch) | |
| tree | 4535cd9951924fed203c3f2f9f5e88bd74fbb052 /Help/manual/cmake-variables.7.rst | |
| parent | 85e959b7273f3d31643dafb2208afdd4a45a3eaf (diff) | |
| parent | 310b58e96155edd0d7d39285639ae903a49df3dc (diff) | |
| download | CMake-796d66438bce2a46235642767d0614c158723738.zip CMake-796d66438bce2a46235642767d0614c158723738.tar.gz CMake-796d66438bce2a46235642767d0614c158723738.tar.bz2 | |
Merge topic 'rename-cross-config-variable'
310b58e961 Ninja Multi-Config: Rename variable to be more consistent
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4234
Diffstat (limited to 'Help/manual/cmake-variables.7.rst')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 0f7d2ec..ae22fdf 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -216,7 +216,6 @@ 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 @@ -424,7 +423,8 @@ Variables that Control the Build /variable/CMAKE_MODULE_LINKER_FLAGS_INIT /variable/CMAKE_MSVCIDE_RUN_PATH /variable/CMAKE_MSVC_RUNTIME_LIBRARY - /variable/CMAKE_NINJA_CROSS_CONFIG_ENABLE + /variable/CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE + /variable/CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE /variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX /variable/CMAKE_NO_BUILTIN_CHRPATH /variable/CMAKE_NO_SYSTEM_FROM_IMPORTED |