summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-12-17 19:44:15 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-12-17 19:44:15 (GMT)
commitbd62c5211576d626d19a27d389d1fa7b42390576 (patch)
treef19c8d66f91cd8a67c5a3eff9ea993c8bf6ee126
parent1dc6f6f8a18be8e9eaaf7e114c47c9d30c352ffd (diff)
parent953d34fd1fd004459704d4625aff54a9dcf9141b (diff)
downloadCMake-bd62c5211576d626d19a27d389d1fa7b42390576.zip
CMake-bd62c5211576d626d19a27d389d1fa7b42390576.tar.gz
CMake-bd62c5211576d626d19a27d389d1fa7b42390576.tar.bz2
Merge topic 'doc-custom-command-depends'
953d34fd Help: Document MAIN_DEPENDENCY limitation in add_custom_command 9859042c Help: Mention add_dependencies in add_custom_target DEPENDS option
-rw-r--r--Help/command/add_custom_command.rst3
-rw-r--r--Help/command/add_custom_target.rst3
2 files changed, 5 insertions, 1 deletions
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.
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