diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-08 13:47:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-08 13:47:56 (GMT) |
| commit | 9783825de5e3398806a432a3c72f048b88bf9640 (patch) | |
| tree | fc81b92b3dda80726c17915ee74309ac50eb56b3 /Source/cmSystemTools.cxx | |
| parent | 3f0a5b3fe849776ef9c087d34bf3fb740913bae1 (diff) | |
| parent | 65baaa0e37e114cf8e505c10d80ec3efaf3887ad (diff) | |
| download | CMake-9783825de5e3398806a432a3c72f048b88bf9640.zip CMake-9783825de5e3398806a432a3c72f048b88bf9640.tar.gz CMake-9783825de5e3398806a432a3c72f048b88bf9640.tar.bz2 | |
Merge topic 'runsinglecommand'
65baaa0e37 cmSystemTools::RunSingleCommand: Accept std::string argument
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2927
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index ba40ce1..b3e6e62 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -867,7 +867,7 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command, return result; } -bool cmSystemTools::RunSingleCommand(const char* command, +bool cmSystemTools::RunSingleCommand(const std::string& command, std::string* captureStdOut, std::string* captureStdErr, int* retVal, const char* dir, OutputOption outputflag, @@ -877,7 +877,8 @@ bool cmSystemTools::RunSingleCommand(const char* command, outputflag = OUTPUT_NONE; } - std::vector<std::string> args = cmSystemTools::ParseArguments(command); + std::vector<std::string> args = + cmSystemTools::ParseArguments(command.c_str()); if (args.empty()) { return false; |