This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  4d80bd5cd5d7889fcd5d3b02519979034aec82e3 (commit)
       via  435f71fe124c9bde1d04b24589f118e908b2a48f (commit)
       via  9098d3176018055f3c0208e2ee3aa065f7bbfa21 (commit)
       via  bb8b3727c9aa9b17a55f3f37d8884bb57aeaa73d (commit)
      from  842f70c49359bfd9a13e333f2571371f64d163e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d80bd5cd5d7889fcd5d3b02519979034aec82e3
commit 4d80bd5cd5d7889fcd5d3b02519979034aec82e3
Merge: 842f70c 435f71f
Author:     Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 4 12:46:25 2019 +0000
Commit:     Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jun 4 08:46:33 2019 -0400

    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 <kwro...@kitware.com>
    Merge-request: !3419


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=435f71fe124c9bde1d04b24589f118e908b2a48f
commit 435f71fe124c9bde1d04b24589f118e908b2a48f
Author:     Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Tue Jun 4 08:37:20 2019 -0400
Commit:     Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 4 08:45:49 2019 -0400

    Help: Clarify COMPILE_LANG_AND_ID release note

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.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9098d3176018055f3c0208e2ee3aa065f7bbfa21
commit 9098d3176018055f3c0208e2ee3aa065f7bbfa21
Author:     Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Tue Jun 4 08:36:08 2019 -0400
Commit:     Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 4 08:45:49 2019 -0400

    Help: Clarify vs-just-my-code-debugging release note language

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`.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb8b3727c9aa9b17a55f3f37d8884bb57aeaa73d
commit bb8b3727c9aa9b17a55f3f37d8884bb57aeaa73d
Author:     Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Tue Jun 4 08:35:46 2019 -0400
Commit:     Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 4 08:45:49 2019 -0400

    Help: Reference project command in CMAKE_PROJECT_INCLUDE_BEFORE relnotes

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.

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/genex-COMPILE_LANG_AND_ID.rst | 2 +-
 Help/release/dev/project-include-before.rst    | 2 +-
 Help/release/dev/vs-just-my-code-debugging.rst | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits

Reply via email to