diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-08 13:15:54 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-08 08:16:43 -0500 |
| commit | db2444200794cd459f19c22bb40cf1fb385807a7 (patch) | |
| tree | b5bbc8b1b6d2571b3e72ad2cc9de09e8a2011355 | |
| parent | 5e0bd923bde5b73ff5a6d03c1ab69d157b6c262b (diff) | |
| parent | 128c414a569d73e5c2c6932999348a12b31d7a48 (diff) | |
| download | cmake-db2444200794cd459f19c22bb40cf1fb385807a7.tar.gz | |
Merge topic 'doc-msvc-abi' into release-3.25
128c414a56 Help: Clarify compilers affected by MSVC ABI abstractions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7881
| -rw-r--r-- | Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.txt | 5 | ||||
| -rw-r--r-- | Help/prop_tgt/MSVC_RUNTIME_LIBRARY-VALUES.txt | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.txt b/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.txt index 889d97a418..7f19bc09ff 100644 --- a/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.txt +++ b/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.txt @@ -8,8 +8,9 @@ Compile with ``-ZI`` or equivalent flag(s) to produce a program database that supports the Edit and Continue feature. -The value is ignored on non-MSVC compilers, but an unsupported value will -be rejected as an error when using a compiler targeting the MSVC ABI. +The value is ignored on compilers not targeting the MSVC ABI, but an +unsupported value will be rejected as an error when using a compiler +targeting the MSVC ABI. The value may also be the empty string (``""``), in which case no debug information format flag will be added explicitly by CMake. diff --git a/Help/prop_tgt/MSVC_RUNTIME_LIBRARY-VALUES.txt b/Help/prop_tgt/MSVC_RUNTIME_LIBRARY-VALUES.txt index 6c6134197b..5f8b82dec6 100644 --- a/Help/prop_tgt/MSVC_RUNTIME_LIBRARY-VALUES.txt +++ b/Help/prop_tgt/MSVC_RUNTIME_LIBRARY-VALUES.txt @@ -11,8 +11,9 @@ Compile with ``-MDd`` or equivalent flag(s) to use a multi-threaded dynamically-linked runtime library. -The value is ignored on non-MSVC compilers but an unsupported value will -be rejected as an error when using a compiler targeting the MSVC ABI. +The value is ignored on compilers not targeting the MSVC ABI, but an +unsupported value will be rejected as an error when using a compiler +targeting the MSVC ABI. The value may also be the empty string (``""``) in which case no runtime library selection flag will be added explicitly by CMake. Note that with |