diff options
| author | Craig Scott <craig.scott@crascit.com> | 2017-12-27 10:56:00 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2017-12-27 10:56:00 (GMT) |
| commit | 8caec41e6e1debb2b54a63c370f6268ca76544ff (patch) | |
| tree | a72e627dbc6442c9bf550042c15c96d262a790ee /Source/cmProcessOutput.cxx | |
| parent | 497f4bb941a84bacfca2392759de6cb8e23b0684 (diff) | |
| download | CMake-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 'Source/cmProcessOutput.cxx')
| -rw-r--r-- | Source/cmProcessOutput.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmProcessOutput.cxx b/Source/cmProcessOutput.cxx index 617e1ca..8371706 100644 --- a/Source/cmProcessOutput.cxx +++ b/Source/cmProcessOutput.cxx @@ -13,7 +13,7 @@ cmProcessOutput::Encoding cmProcessOutput::FindEncoding( std::string const& name) { Encoding encoding = Auto; - if (name == "UTF8") { + if ((name == "UTF8") || (name == "UTF-8")) { encoding = UTF8; } else if (name == "NONE") { encoding = None; |