summaryrefslogtreecommitdiffstats
path: root/Tests/CMakeLib
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 /Tests/CMakeLib
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 'Tests/CMakeLib')
-rw-r--r--Tests/CMakeLib/testEncoding.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeLib/testEncoding.cxx b/Tests/CMakeLib/testEncoding.cxx
index 5e40638..11f6409 100644
--- a/Tests/CMakeLib/testEncoding.cxx
+++ b/Tests/CMakeLib/testEncoding.cxx
@@ -31,7 +31,7 @@ int main(int argc, char* argv[])
}
const std::string encoding(argv[1]);
#ifdef _WIN32
- if (encoding == "UTF8") {
+ if ((encoding == "UTF8") || (encoding == "UTF-8")) {
setEncoding(consoleOut, CP_UTF8);
} else if (encoding == "ANSI") {
setEncoding(consoleOut, CP_ACP);