diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-24 15:55:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-24 15:55:26 (GMT) |
| commit | 786b56942b359e79cce489f12bf4426b4dc505de (patch) | |
| tree | d31263fd656d2b0cf9d902281f8f92d3c1ab837c /Help/manual | |
| parent | 4dbc9dfc7a1458878a26e1f0cec1a382e14bf48a (diff) | |
| parent | ae1e1909a13fa6e68c33fe92cc8f5c76c30df76f (diff) | |
| download | CMake-786b56942b359e79cce489f12bf4426b4dc505de.zip CMake-786b56942b359e79cce489f12bf4426b4dc505de.tar.gz CMake-786b56942b359e79cce489f12bf4426b4dc505de.tar.bz2 | |
Merge topic 'vs-dotnet-standard-core'
ae1e1909a1 VS: Add support for .NET Standard and .NET Core
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4240
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 1 | ||||
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 393735e..3a62371 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -185,6 +185,7 @@ Properties on Targets /prop_tgt/DEPLOYMENT_ADDITIONAL_FILES /prop_tgt/DEPRECATION /prop_tgt/DISABLE_PRECOMPILE_HEADERS + /prop_tgt/DOTNET_TARGET_FRAMEWORK /prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION /prop_tgt/EchoString /prop_tgt/ENABLE_EXPORTS diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index da2b06e..bac8415 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -48,6 +48,7 @@ Variables that Provide Information /variable/CMAKE_DEBUG_TARGET_PROPERTIES /variable/CMAKE_DIRECTORY_LABELS /variable/CMAKE_DL_LIBS + /variable/CMAKE_DOTNET_TARGET_FRAMEWORK /variable/CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION /variable/CMAKE_EDIT_COMMAND /variable/CMAKE_EXECUTABLE_SUFFIX |