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/CTest/cmCTestBuildHandler.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/CTest/cmCTestBuildHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index cd1f879..a455908 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -766,7 +766,7 @@ void cmCTestBuildHandler::LaunchHelper::WriteScrapeMatchers( int cmCTestBuildHandler::RunMakeCommand(const char* command, int* retVal, const char* dir, int timeout, - std::ostream& ofs) + std::ostream& ofs, Encoding encoding) { // First generate the command and arguments std::vector<std::string> args = cmSystemTools::ParseArguments(command); @@ -810,7 +810,7 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command, int* retVal, char* data; int length; - cmProcessOutput processOutput; + cmProcessOutput processOutput(encoding); std::string strdata; cmCTestOptionalLog( this->CTest, HANDLER_PROGRESS_OUTPUT, " Each symbol represents " |