[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1187-g2123458

[Brad King]

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, next has been updated
       via  2123458b2d7eb2c3ab2a7a6275098477de1176a2 (commit)
       via  953d34fd1fd004459704d4625aff54a9dcf9141b (commit)
       via  9859042c0501f444fbb9d5f2b78b5e563a97f71d (commit)
      from  ab8daef62e29365988d595dd6bbf47fcd8aacc4e (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2123458b2d7eb2c3ab2a7a6275098477de1176a2
commit 2123458b2d7eb2c3ab2a7a6275098477de1176a2
Merge: ab8daef 953d34f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 10:39:38 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 16 10:39:38 2014 -0500

    Merge topic 'doc-custom-command-depends' into next
    
    953d34fd Help: Document MAIN_DEPENDENCY limitation in add_custom_command
    9859042c Help: Mention add_dependencies in add_custom_target DEPENDS option


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=953d34fd1fd004459704d4625aff54a9dcf9141b
commit 953d34fd1fd004459704d4625aff54a9dcf9141b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 10:38:43 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 16 10:38:43 2014 -0500

    Help: Document MAIN_DEPENDENCY limitation in add_custom_command
    
    Specify explicitly that at most one custom command may use a given
    source file as its main dependency.

diff --git a/Help/command/add_custom_command.rst b/Help/command/add_custom_command.rst
index 9fbad4b..1307a58 100644
--- a/Help/command/add_custom_command.rst
+++ b/Help/command/add_custom_command.rst
@@ -130,7 +130,8 @@ The options are:
   Specify the primary input source file to the command.  This is
   treated just like any value given to the ``DEPENDS`` option
   but also suggests to Visual Studio generators where to hang
-  the custom command.
+  the custom command.  At most one custom command may specify a
+  given source file as its main dependency.
 
 ``OUTPUT``
   Specify the output files the command is expected to produce.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9859042c0501f444fbb9d5f2b78b5e563a97f71d
commit 9859042c0501f444fbb9d5f2b78b5e563a97f71d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 10:38:10 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 16 10:38:10 2014 -0500

    Help: Mention add_dependencies in add_custom_target DEPENDS option
    
    This will direct readers looking to add target-level dependencies.

diff --git a/Help/command/add_custom_target.rst b/Help/command/add_custom_target.rst
index 996d08e..5134a70 100644
--- a/Help/command/add_custom_target.rst
+++ b/Help/command/add_custom_target.rst
@@ -82,6 +82,9 @@ The options are:
   (``CMakeLists.txt`` file).  They will be brought up to date when
   the target is built.
 
+  Use the :command:`add_dependencies` command to add dependencies
+  on other targets.
+
 ``SOURCES``
   Specify additional source files to be included in the custom target.
   Specified source files will be added to IDE project files for

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

Summary of changes:
 Help/command/add_custom_command.rst |    3 ++-
 Help/command/add_custom_target.rst  |    3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake