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/CPack/WiX/cmCPackWIXGenerator.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/CPack/WiX/cmCPackWIXGenerator.cxx')
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 398ebd3..f522ce2 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -61,9 +61,8 @@ bool cmCPackWIXGenerator::RunWiXCommand(std::string const& command) std::string output; int returnValue = 0; - bool status = cmSystemTools::RunSingleCommand(command.c_str(), &output, - &output, &returnValue, 0, - cmSystemTools::OUTPUT_NONE); + bool status = cmSystemTools::RunSingleCommand( + command, &output, &output, &returnValue, 0, cmSystemTools::OUTPUT_NONE); cmsys::ofstream logFile(logFileName.c_str(), std::ios::app); logFile << command << std::endl; |