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 /Source | |
| 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 'Source')
| -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; |