diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-22 14:32:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-22 14:32:58 (GMT) |
| commit | cb7fbf1dbbcc88fc7701250db5c3ccdf0ab7396e (patch) | |
| tree | 6f19fc14a53cc58f2d2234077ee596934a60afe6 /Source/cmExecProgramCommand.cxx | |
| parent | acaf9801d004dc77d8abbb09b2ce3a88fd182322 (diff) | |
| parent | 3132ea801c2466773309edda82387025f903fc12 (diff) | |
| download | CMake-cb7fbf1dbbcc88fc7701250db5c3ccdf0ab7396e.zip CMake-cb7fbf1dbbcc88fc7701250db5c3ccdf0ab7396e.tar.gz CMake-cb7fbf1dbbcc88fc7701250db5c3ccdf0ab7396e.tar.bz2 | |
Merge topic 'stdout-string'
3132ea801c cmSystemTools: Stdout(),Stderr() accept std::string argument
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2829
Diffstat (limited to 'Source/cmExecProgramCommand.cxx')
| -rw-r--r-- | Source/cmExecProgramCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx index ea4cd40..49d9841 100644 --- a/Source/cmExecProgramCommand.cxx +++ b/Source/cmExecProgramCommand.cxx @@ -221,7 +221,7 @@ bool cmExecProgramCommand::RunCommand(const char* command, std::string& output, if (p == cmsysProcess_Pipe_STDOUT || p == cmsysProcess_Pipe_STDERR) { if (verbose) { processOutput.DecodeText(data, length, strdata); - cmSystemTools::Stdout(strdata.c_str(), strdata.size()); + cmSystemTools::Stdout(strdata); } output.append(data, length); } @@ -230,7 +230,7 @@ bool cmExecProgramCommand::RunCommand(const char* command, std::string& output, if (verbose) { processOutput.DecodeText(std::string(), strdata); if (!strdata.empty()) { - cmSystemTools::Stdout(strdata.c_str(), strdata.size()); + cmSystemTools::Stdout(strdata); } } @@ -270,7 +270,7 @@ bool cmExecProgramCommand::RunCommand(const char* command, std::string& output, } msg += "\n"; if (verbose) { - cmSystemTools::Stdout(msg.c_str()); + cmSystemTools::Stdout(msg); } output += msg; #else |