diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-04 12:46:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-06-04 12:46:33 (GMT) |
| commit | 4d80bd5cd5d7889fcd5d3b02519979034aec82e3 (patch) | |
| tree | 6fef24abd21ea95239a0bd51de266cfe994a25d8 | |
| parent | 842f70c49359bfd9a13e333f2571371f64d163e1 (diff) | |
| parent | 435f71fe124c9bde1d04b24589f118e908b2a48f (diff) | |
| download | CMake-4d80bd5cd5d7889fcd5d3b02519979034aec82e3.zip CMake-4d80bd5cd5d7889fcd5d3b02519979034aec82e3.tar.gz CMake-4d80bd5cd5d7889fcd5d3b02519979034aec82e3.tar.bz2 | |
Merge topic 'tweaks_to_release_notes'
435f71fe12 Help: Clarify COMPILE_LANG_AND_ID release note
9098d31760 Help: Clarify vs-just-my-code-debugging release note language
bb8b3727c9 Help: Reference project command in CMAKE_PROJECT_INCLUDE_BEFORE relnotes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3419
| -rw-r--r-- | Help/release/dev/genex-COMPILE_LANG_AND_ID.rst | 2 | ||||
| -rw-r--r-- | Help/release/dev/project-include-before.rst | 2 | ||||
| -rw-r--r-- | Help/release/dev/vs-just-my-code-debugging.rst | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Help/release/dev/genex-COMPILE_LANG_AND_ID.rst b/Help/release/dev/genex-COMPILE_LANG_AND_ID.rst index 27e0ebd..760fca8 100644 --- a/Help/release/dev/genex-COMPILE_LANG_AND_ID.rst +++ b/Help/release/dev/genex-COMPILE_LANG_AND_ID.rst @@ -3,5 +3,5 @@ genex-COMPILE_LANG_AND_ID * A new ``COMPILE_LANG_AND_ID`` generator expression was introduced to allow specification of compile options for target files based on the - :variable:`CMAKE_<LANG>_COMPILER_ID` and :prop_sf:`LANGUAGE` and of + :variable:`CMAKE_<LANG>_COMPILER_ID` and :prop_sf:`LANGUAGE` of each source file. diff --git a/Help/release/dev/project-include-before.rst b/Help/release/dev/project-include-before.rst index 3f16cd7..9a9e067 100644 --- a/Help/release/dev/project-include-before.rst +++ b/Help/release/dev/project-include-before.rst @@ -2,4 +2,4 @@ cmake_project_include_before ---------------------------- * A variable :variable:`CMAKE_PROJECT_INCLUDE_BEFORE` was added to allow - injection of custom code into the project. + injection of custom code before the :command:`project` call. diff --git a/Help/release/dev/vs-just-my-code-debugging.rst b/Help/release/dev/vs-just-my-code-debugging.rst index 73299d9..c53ee6c 100644 --- a/Help/release/dev/vs-just-my-code-debugging.rst +++ b/Help/release/dev/vs-just-my-code-debugging.rst @@ -1,9 +1,9 @@ vs-just-my-code-debugging ------------------------- -* For the :ref:`Visual Studio Generators`, for the - :ref:`Makefile Generators` and the :generator:`Ninja` generator - the Just My Code feature of the Visual Studio Debugger could be +* For the :ref:`Visual Studio Generators`, + :ref:`Makefile Generators`, and the :generator:`Ninja` generators + the Just My Code feature of the Visual Studio Debugger can be leveraged by turning on the :prop_tgt:`VS_JUST_MY_CODE_DEBUGGING` target property. Its default value is provided by the variable :variable:`CMAKE_VS_JUST_MY_CODE_DEBUGGING`. |