summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-05-07 18:40:38 (GMT)
committerBrad King <brad.king@kitware.com>2015-05-07 18:40:38 (GMT)
commitf65bb82f3688ba33faccf2ef0690571e1aa6edc2 (patch)
tree109fa5d5bcbc524b05f066b15749272f969f5ec8 /Help
parent31c218e6e12affd482b9ce2880bd9385c77d9025 (diff)
downloadCMake-f65bb82f3688ba33faccf2ef0690571e1aa6edc2.zip
CMake-f65bb82f3688ba33faccf2ef0690571e1aa6edc2.tar.gz
CMake-f65bb82f3688ba33faccf2ef0690571e1aa6edc2.tar.bz2
execute_process: Improve stdout/stderr merging
Use the KWSys Process "MergeOutput" option to give the child process the same pipe (or file) for both stdout and stderr. This allows natural merging of stdout and stderr together instead of merging on arbitrary buffered read boundaries as before.
Diffstat (limited to 'Help')
-rw-r--r--Help/command/execute_process.rst3
-rw-r--r--Help/release/dev/execute_process-merge-output.rst5
2 files changed, 7 insertions, 1 deletions
diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst
index 478b30e..c38ec1a 100644
--- a/Help/command/execute_process.rst
+++ b/Help/command/execute_process.rst
@@ -57,7 +57,8 @@ OUTPUT_VARIABLE, ERROR_VARIABLE
INPUT_FILE, OUTPUT_FILE, ERROR_FILE
The file named will be attached to the standard input of the first
process, standard output of the last process, or standard error of
- all processes, respectively.
+ all processes, respectively. If the same file is named for both
+ output and error then it will be used for both.
OUTPUT_QUIET, ERROR_QUIET
The standard output or standard error results will be quietly ignored.
diff --git a/Help/release/dev/execute_process-merge-output.rst b/Help/release/dev/execute_process-merge-output.rst
new file mode 100644
index 0000000..4c80cdd
--- /dev/null
+++ b/Help/release/dev/execute_process-merge-output.rst
@@ -0,0 +1,5 @@
+execute_process-merge-output
+----------------------------
+
+* The :command:`execute_process` command learned to support specifying
+ the same file for ``OUTPUT_FILE`` and ``ERROR_FILE``.