diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-19 15:18:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-19 15:18:44 (GMT) |
| commit | 8d2299975393bb341d7afe8bdd200b8dbe3010e3 (patch) | |
| tree | 1aa5a5b1407824b840a57a58b757099c89dcfa10 /Help | |
| parent | d96bc3cf048756695a651a8561b763cfc5cead86 (diff) | |
| parent | 282d9f31685906cd45b27961ea013edab8bacd6b (diff) | |
| download | CMake-8d2299975393bb341d7afe8bdd200b8dbe3010e3.zip CMake-8d2299975393bb341d7afe8bdd200b8dbe3010e3.tar.gz CMake-8d2299975393bb341d7afe8bdd200b8dbe3010e3.tar.bz2 | |
Merge branch 'msvc-runtime-library-doc' into release-3.15
Merge-request: !3573
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/policy/CMP0091.rst | 4 | ||||
| -rw-r--r-- | Help/prop_tgt/MSVC_RUNTIME_LIBRARY.rst | 3 | ||||
| -rw-r--r-- | Help/variable/CMAKE_MSVC_RUNTIME_LIBRARY.rst | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Help/policy/CMP0091.rst b/Help/policy/CMP0091.rst index 5b7c4e3..1a5878a 100644 --- a/Help/policy/CMP0091.rst +++ b/Help/policy/CMP0091.rst @@ -20,7 +20,9 @@ CMake 3.15 and above prefer to leave the MSVC runtime library selection flags out of the default :variable:`CMAKE_<LANG>_FLAGS_<CONFIG>` values and instead offer a first-class abstraction. The :variable:`CMAKE_MSVC_RUNTIME_LIBRARY` variable and :prop_tgt:`MSVC_RUNTIME_LIBRARY` target property may be set to -select the MSVC runtime library. +select the MSVC runtime library. If they are not set then CMake uses the +default value ``MultiThreaded$<$<CONFIG:Debug>:Debug>DLL`` which is +equivalent to the original flags. This policy provides compatibility with projects that have not been updated to be aware of the abstraction. The policy setting takes effect as of the diff --git a/Help/prop_tgt/MSVC_RUNTIME_LIBRARY.rst b/Help/prop_tgt/MSVC_RUNTIME_LIBRARY.rst index 1e3f5e9..73792de 100644 --- a/Help/prop_tgt/MSVC_RUNTIME_LIBRARY.rst +++ b/Help/prop_tgt/MSVC_RUNTIME_LIBRARY.rst @@ -19,6 +19,9 @@ support per-configuration specification. For example, the code: selects for the target ``foo`` a multi-threaded statically-linked runtime library with or without debug information depending on the configuration. +If this property is not set then CMake uses the default value +``MultiThreaded$<$<CONFIG:Debug>:Debug>DLL`` to select a MSVC runtime library. + .. note:: This property has effect only when policy :policy:`CMP0091` is set to ``NEW`` diff --git a/Help/variable/CMAKE_MSVC_RUNTIME_LIBRARY.rst b/Help/variable/CMAKE_MSVC_RUNTIME_LIBRARY.rst index 6ed68c9..8b54e7e 100644 --- a/Help/variable/CMAKE_MSVC_RUNTIME_LIBRARY.rst +++ b/Help/variable/CMAKE_MSVC_RUNTIME_LIBRARY.rst @@ -20,6 +20,11 @@ support per-configuration specification. For example, the code: selects for all following targets a multi-threaded statically-linked runtime library with or without debug information depending on the configuration. +If this variable is not set then the :prop_tgt:`MSVC_RUNTIME_LIBRARY` target +property will not be set automatically. If that property is not set then +CMake uses the default value ``MultiThreaded$<$<CONFIG:Debug>:Debug>DLL`` +to select a MSVC runtime library. + .. note:: This variable has effect only when policy :policy:`CMP0091` is set to ``NEW`` |