summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2017-12-27 10:56:00 (GMT)
committerCraig Scott <craig.scott@crascit.com>2017-12-27 10:56:00 (GMT)
commit8caec41e6e1debb2b54a63c370f6268ca76544ff (patch)
treea72e627dbc6442c9bf550042c15c96d262a790ee /Help
parent497f4bb941a84bacfca2392759de6cb8e23b0684 (diff)
downloadCMake-8caec41e6e1debb2b54a63c370f6268ca76544ff.zip
CMake-8caec41e6e1debb2b54a63c370f6268ca76544ff.tar.gz
CMake-8caec41e6e1debb2b54a63c370f6268ca76544ff.tar.bz2
execute_process: Allow UTF-8 as a synonym for the UTF8 keyword
UTF-8 is the proper naming according to the UTF-8 RFC and is also the name used for a similar keyword in the file() command. This commit brings (backward compatible) consistency to the keyword names and allows the standard UTF-8 name to be used with execute_process(). The old UTF8 keyword is still supported.
Diffstat (limited to 'Help')
-rw-r--r--Help/command/execute_process.rst6
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.