summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-01 14:58:40 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-11-01 14:58:40 (GMT)
commitc88a078d690f72caea53b0723e8393b83f1b0b6f (patch)
tree94bc85a507065ccb39753d0543c6689493eff3bf
parent2fb83cc8710898e1fc802b68c9d55c456913719a (diff)
parent311d0376e2312d3539bd997160f880cf58743834 (diff)
downloadCMake-c88a078d690f72caea53b0723e8393b83f1b0b6f.zip
CMake-c88a078d690f72caea53b0723e8393b83f1b0b6f.tar.gz
CMake-c88a078d690f72caea53b0723e8393b83f1b0b6f.tar.bz2
Merge topic 'doc-tweaks'
311d0376 Help: Document error behavior of file(REMOVE/REMOVE_RECURSE) 77e78af1 Help: Clarify how to run sequential commands in execute_process
-rw-r--r--Help/command/execute_process.rst5
-rw-r--r--Help/command/file.rst3
2 files changed, 6 insertions, 2 deletions
diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst
index ca44b53..e9a5eb0 100644
--- a/Help/command/execute_process.rst
+++ b/Help/command/execute_process.rst
@@ -20,7 +20,7 @@ Execute one or more child processes.
[OUTPUT_STRIP_TRAILING_WHITESPACE]
[ERROR_STRIP_TRAILING_WHITESPACE])
-Runs the given sequence of one or more commands with the standard
+Runs the given sequence of one or more commands in parallel with the standard
output of each process piped to the standard input of the next.
A single standard error pipe is used for all processes.
@@ -36,6 +36,9 @@ Options:
(Use the ``INPUT_*``, ``OUTPUT_*``, and ``ERROR_*`` options to
redirect stdin, stdout, and stderr.)
+ If a sequential execution of multiple commands is required, use multiple
+ :command:`execute_process` calls with a single ``COMMAND`` argument.
+
``WORKING_DIRECTORY``
The named directory will be set as the current working directory of
the child processes.
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 77e9f62..8da46cb 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -153,7 +153,8 @@ Move a file or directory within a filesystem from ``<oldname>`` to
file(REMOVE_RECURSE [<files>...])
Remove the given files. The ``REMOVE_RECURSE`` mode will remove the given
-files and directories, also non-empty directories
+files and directories, also non-empty directories. No error is emitted if a
+given file does not exist.
------------------------------------------------------------------------------