summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/execute_process
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/RunCMake/execute_process
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/RunCMake/execute_process')
-rw-r--r--Tests/RunCMake/execute_process/EncodingUTF-8-stderr.txt1
-rw-r--r--Tests/RunCMake/execute_process/RunCMakeTest.cmake1
2 files changed, 2 insertions, 0 deletions
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)