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/IFW/cmCPackIFWGenerator.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/IFW/cmCPackIFWGenerator.cxx')
| -rw-r--r-- | Source/CPack/IFW/cmCPackIFWGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx index 9102e3e..c1b6eea 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx +++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx @@ -85,8 +85,8 @@ int cmCPackIFWGenerator::PackageFiles() int retVal = 1; cmCPackIFWLogger(OUTPUT, "- Generate repository" << std::endl); bool res = cmSystemTools::RunSingleCommand( - ifwCmd.c_str(), &output, &output, &retVal, nullptr, - this->GeneratorVerbose, cmDuration::zero()); + ifwCmd, &output, &output, &retVal, nullptr, this->GeneratorVerbose, + cmDuration::zero()); if (!res || retVal) { cmGeneratedFileStream ofs(ifwTmpFile); ofs << "# Run command: " << ifwCmd << std::endl @@ -198,8 +198,8 @@ int cmCPackIFWGenerator::PackageFiles() int retVal = 1; cmCPackIFWLogger(OUTPUT, "- Generate package" << std::endl); bool res = cmSystemTools::RunSingleCommand( - ifwCmd.c_str(), &output, &output, &retVal, nullptr, - this->GeneratorVerbose, cmDuration::zero()); + ifwCmd, &output, &output, &retVal, nullptr, this->GeneratorVerbose, + cmDuration::zero()); if (!res || retVal) { cmGeneratedFileStream ofs(ifwTmpFile); ofs << "# Run command: " << ifwCmd << std::endl |