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/cmExecProgramCommand.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/cmExecProgramCommand.cxx')
| -rw-r--r-- | Source/cmExecProgramCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx index 6c271a2..6a7292d 100644 --- a/Source/cmExecProgramCommand.cxx +++ b/Source/cmExecProgramCommand.cxx @@ -117,7 +117,7 @@ bool cmExecProgramCommand::InitialPass(std::vector<std::string> const& args, bool cmExecProgramCommand::RunCommand(const char* command, std::string& output, int& retVal, const char* dir, - bool verbose) + bool verbose, Encoding encoding) { if (cmSystemTools::GetRunCommandOutput()) { verbose = false; @@ -215,7 +215,7 @@ bool cmExecProgramCommand::RunCommand(const char* command, std::string& output, int length; char* data; int p; - cmProcessOutput processOutput; + cmProcessOutput processOutput(encoding); std::string strdata; while ((p = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR), p)) { if (p == cmsysProcess_Pipe_STDOUT || p == cmsysProcess_Pipe_STDERR) { |