summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-12-02 14:54:09 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-12-02 14:54:09 (GMT)
commitf7425c2177e3368ec83e2731cc092dcd2a999d82 (patch)
tree9d94cabc91f3cc9c343d16ea3b661f81ec64ebcd /Help
parentbd6a269e1acf7f5634d05bb085d9e12cf51e9e35 (diff)
parent2ed473b3b8e28485e6a14a49c7e0e4133eb02eee (diff)
downloadCMake-f7425c2177e3368ec83e2731cc092dcd2a999d82.zip
CMake-f7425c2177e3368ec83e2731cc092dcd2a999d82.tar.gz
CMake-f7425c2177e3368ec83e2731cc092dcd2a999d82.tar.bz2
Merge topic 'execute_process-encoding'
2ed473b3 execute_process: Add ENCODING option for Windows child process output
Diffstat (limited to 'Help')
-rw-r--r--Help/command/execute_process.rst11
-rw-r--r--Help/release/dev/execute_process-encoding.rst5
2 files changed, 15 insertions, 1 deletions
diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst
index e9a5eb0..71233d9 100644
--- a/Help/command/execute_process.rst
+++ b/Help/command/execute_process.rst
@@ -18,7 +18,8 @@ Execute one or more child processes.
[OUTPUT_QUIET]
[ERROR_QUIET]
[OUTPUT_STRIP_TRAILING_WHITESPACE]
- [ERROR_STRIP_TRAILING_WHITESPACE])
+ [ERROR_STRIP_TRAILING_WHITESPACE]
+ [ENCODING <name>])
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.
@@ -66,6 +67,14 @@ Options:
``OUTPUT_QUIET``, ``ERROR_QUIET``
The standard output or standard error results will be quietly ignored.
+``ENCODING <name>``
+ On Windows, the encoding that is used to decode output from the process.
+ Ignored on other platforms.
+ Valid encoding names are: ``AUTO`` (the default), ``NONE``, ``UTF8``,
+ ``ANSI`` and ``OEM``.
+ ``AUTO`` encoding means current active console's codepage will be used
+ or if that isn't available then ``ANSI`` codepage will be used.
+
If more than one ``OUTPUT_*`` or ``ERROR_*`` option is given for the
same pipe the precedence is not specified.
If no ``OUTPUT_*`` or ``ERROR_*`` options are given the output will
diff --git a/Help/release/dev/execute_process-encoding.rst b/Help/release/dev/execute_process-encoding.rst
new file mode 100644
index 0000000..1c7cd8c
--- /dev/null
+++ b/Help/release/dev/execute_process-encoding.rst
@@ -0,0 +1,5 @@
+execute_process-encoding
+------------------------
+
+* The :command:`execute_process` command gained an ``ENCODING`` option to
+ specify on Windows which encoding is used for output from child process.