summaryrefslogtreecommitdiffstats
path: root/Source/cmProcessOutput.cxx
diff options
context:
space:
mode:
authorDāvis Mosāns <davispuh@gmail.com>2016-11-23 12:11:40 (GMT)
committerBrad King <brad.king@kitware.com>2016-11-30 14:06:51 (GMT)
commit2ed473b3b8e28485e6a14a49c7e0e4133eb02eee (patch)
tree1343f0e826693c923074102e588f90f0678e3cc5 /Source/cmProcessOutput.cxx
parent076aef8e45a91e83f9a7d879712fd70778d67c92 (diff)
downloadCMake-2ed473b3b8e28485e6a14a49c7e0e4133eb02eee.zip
CMake-2ed473b3b8e28485e6a14a49c7e0e4133eb02eee.tar.gz
CMake-2ed473b3b8e28485e6a14a49c7e0e4133eb02eee.tar.bz2
execute_process: Add ENCODING option for Windows child process output
Different applications can use different output encodings.
Diffstat (limited to 'Source/cmProcessOutput.cxx')
-rw-r--r--Source/cmProcessOutput.cxx15
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/cmProcessOutput.cxx b/Source/cmProcessOutput.cxx
index 1440223..8b4d0e1 100644
--- a/Source/cmProcessOutput.cxx
+++ b/Source/cmProcessOutput.cxx
@@ -9,6 +9,21 @@ unsigned int cmProcessOutput::defaultCodepage =
KWSYS_ENCODING_DEFAULT_CODEPAGE;
#endif
+cmProcessOutput::Encoding cmProcessOutput::FindEncoding(std::string name)
+{
+ Encoding encoding = Auto;
+ if (name == "UTF8") {
+ encoding = UTF8;
+ } else if (name == "NONE") {
+ encoding = None;
+ } else if (name == "ANSI") {
+ encoding = ANSI;
+ } else if (name == "OEM") {
+ encoding = OEM;
+ }
+ return encoding;
+}
+
cmProcessOutput::cmProcessOutput(Encoding encoding, unsigned int maxSize)
{
#if defined(_WIN32)