[Cmake-commits] CMake branch, master, updated. v3.11.1-680-g1e788a9

[Kitware Robot]

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  1e788a964d198fc3c135afd053afdefc531bf369 (commit)
       via  6dd11ffbdea74fae55f17515c9d16dce7bd33c30 (commit)
      from  2d7a0862e41e9240c74f8d1ecef400fbf3f96ba8 (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=1e788a964d198fc3c135afd053afdefc531bf369
commit 1e788a964d198fc3c135afd053afdefc531bf369
Merge: 2d7a086 6dd11ff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 3 11:54:21 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu May 3 07:55:34 2018 -0400

    Merge topic 'doc-build-event-order'
    
    6dd11ffbde Help: Clarify add_custom_command build event execution order
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2030


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dd11ffbdea74fae55f17515c9d16dce7bd33c30
commit 6dd11ffbdea74fae55f17515c9d16dce7bd33c30
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 2 13:19:00 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 2 13:19:00 2018 -0400

    Help: Clarify add_custom_command build event execution order
    
    Fixes: #17949

diff --git a/Help/command/add_custom_command.rst b/Help/command/add_custom_command.rst
index e3fb6b6..5f74c54 100644
--- a/Help/command/add_custom_command.rst
+++ b/Help/command/add_custom_command.rst
@@ -216,10 +216,9 @@ When the command will happen is determined by which
 of the following is specified:
 
 ``PRE_BUILD``
-  Run before any other rules are executed within the target.
-  This is supported only on Visual Studio 9 or later.
-  For all other generators ``PRE_BUILD`` will be treated as
-  ``PRE_LINK``.
+  On :ref:`Visual Studio Generators`, run before any other rules are
+  executed within the target.
+  On other generators, run just before ``PRE_LINK`` commands.
 ``PRE_LINK``
   Run after sources have been compiled but before linking the binary
   or running the librarian or archiver tool of a static library.

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

Summary of changes:
 Help/command/add_custom_command.rst |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake