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 /Tests | |
| 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 'Tests')
| -rw-r--r-- | Tests/CMakeLib/testEncoding.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/execute_process/EncodingUTF-8-stderr.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/execute_process/RunCMakeTest.cmake | 1 |
3 files changed, 3 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); diff --git a/Tests/RunCMake/execute_process/EncodingUTF-8-stderr.txt b/Tests/RunCMake/execute_process/EncodingUTF-8-stderr.txt new file mode 100644 index 0000000..0ac68de --- /dev/null +++ b/Tests/RunCMake/execute_process/EncodingUTF-8-stderr.txt @@ -0,0 +1 @@ +यूनिकोड είναι very здорово! diff --git a/Tests/RunCMake/execute_process/RunCMakeTest.cmake b/Tests/RunCMake/execute_process/RunCMakeTest.cmake index 83589bb..cb40b40 100644 --- a/Tests/RunCMake/execute_process/RunCMakeTest.cmake +++ b/Tests/RunCMake/execute_process/RunCMakeTest.cmake @@ -10,6 +10,7 @@ run_cmake_command(MergeOutputVars ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/Mer run_cmake(EncodingMissing) if(TEST_ENCODING_EXE) run_cmake_command(EncodingUTF8 ${CMAKE_COMMAND} -DTEST_ENCODING=UTF8 -DTEST_ENCODING_EXE=${TEST_ENCODING_EXE} -P ${RunCMake_SOURCE_DIR}/Encoding.cmake) + run_cmake_command(EncodingUTF-8 ${CMAKE_COMMAND} -DTEST_ENCODING=UTF-8 -DTEST_ENCODING_EXE=${TEST_ENCODING_EXE} -P ${RunCMake_SOURCE_DIR}/Encoding.cmake) endif() if(EXIT_CODE_EXE) |