diff options
| author | Dāvis Mosāns <davispuh@gmail.com> | 2016-11-01 18:36:58 (GMT) |
|---|---|---|
| committer | Dāvis Mosāns <davispuh@gmail.com> | 2016-11-14 23:00:46 (GMT) |
| commit | 40bd42dfbcafd572ccd3541f1f84177453c9c255 (patch) | |
| tree | d6f0528a9320341c2163930a586bb4404501faed /Source/cmSystemTools.cxx | |
| parent | 595feb323479ce6e8f8e8a3a863f9286d9f7bd64 (diff) | |
| download | CMake-40bd42dfbcafd572ccd3541f1f84177453c9c255.zip CMake-40bd42dfbcafd572ccd3541f1f84177453c9c255.tar.gz CMake-40bd42dfbcafd572ccd3541f1f84177453c9c255.tar.bz2 | |
Add Encoding option for RunChild, RunMakeCommand and RunProcess
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index b656070..029594f 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -574,7 +574,7 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command, std::string* captureStdOut, std::string* captureStdErr, int* retVal, const char* dir, OutputOption outputflag, - double timeout) + double timeout, Encoding encoding) { std::vector<const char*> argv; for (std::vector<std::string>::const_iterator a = command.begin(); @@ -610,7 +610,7 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command, char* data; int length; int pipe; - cmProcessOutput processOutput; + cmProcessOutput processOutput(encoding); std::string strdata; if (outputflag != OUTPUT_PASSTHROUGH && (captureStdOut || captureStdErr || outputflag != OUTPUT_NONE)) { |