diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-08 15:44:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-08 15:44:47 (GMT) |
| commit | f4a314394039708e772374e54a31959f2de14825 (patch) | |
| tree | 5e3e69970a3dd45fd6da54d4e1d58ef41605c786 /Help/command | |
| parent | a3bba2a5ad30287a22f2a700de6a60f0869b8dac (diff) | |
| parent | 8caec41e6e1debb2b54a63c370f6268ca76544ff (diff) | |
| download | CMake-f4a314394039708e772374e54a31959f2de14825.zip CMake-f4a314394039708e772374e54a31959f2de14825.tar.gz CMake-f4a314394039708e772374e54a31959f2de14825.tar.bz2 | |
Merge topic 'execute_process_UTF8_keyword'
8caec41e execute_process: Allow UTF-8 as a synonym for the UTF8 keyword
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1623
Diffstat (limited to 'Help/command')
| -rw-r--r-- | Help/command/execute_process.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst index 799493f..716f457 100644 --- a/Help/command/execute_process.rst +++ b/Help/command/execute_process.rst @@ -90,8 +90,10 @@ Options: Use the ANSI codepage. ``OEM`` Use the original equipment manufacturer (OEM) code page. - ``UTF8`` - Use the UTF-8 codepage. + ``UTF8`` or ``UTF-8`` + Use the UTF-8 codepage. Prior to CMake 3.11.0, only ``UTF8`` was accepted + for this encoding. In CMake 3.11.0, ``UTF-8`` was added for consistency with + the `UTF-8 RFC <https://www.ietf.org/rfc/rfc3629>`_ naming convention. If more than one ``OUTPUT_*`` or ``ERROR_*`` option is given for the same pipe the precedence is not specified. |