diff options
| author | Wouter Klouwen <wouter.klouwen@youview.com> | 2018-01-20 15:13:21 (GMT) |
|---|---|---|
| committer | Wouter Klouwen <wouter.klouwen@youview.com> | 2018-01-23 18:56:42 (GMT) |
| commit | e6a80ccfc440ac8dd5e9e5405744c2423560fc02 (patch) | |
| tree | 22b68d9379421a8a84ff5dab35e9689654334b04 /Source/CPack/cmCPackPackageMakerGenerator.cxx | |
| parent | ff62b00522d1ddaeb88be241ab4a022f935b5c00 (diff) | |
| download | CMake-e6a80ccfc440ac8dd5e9e5405744c2423560fc02.zip CMake-e6a80ccfc440ac8dd5e9e5405744c2423560fc02.tar.gz CMake-e6a80ccfc440ac8dd5e9e5405744c2423560fc02.tar.bz2 | |
Make use of std::chrono throughout every component
This commit continues the changes made in CTest to support std::chrono
by
applying it throughout every component where a duration was used.
No functional change intended.
Diffstat (limited to 'Source/CPack/cmCPackPackageMakerGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackPackageMakerGenerator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index dbcb022..c515b85 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -13,6 +13,7 @@ #include "cmCPackComponentGroup.h" #include "cmCPackLog.h" +#include "cmDuration.h" #include "cmGeneratedFileStream.h" #include "cmSystemTools.h" #include "cmXMLWriter.h" @@ -295,9 +296,9 @@ int cmCPackPackageMakerGenerator::PackageFiles() int numTries = 10; bool res = false; while (numTries > 0) { - res = cmSystemTools::RunSingleCommand(dmgCmd.str().c_str(), &output, - &output, &retVal, nullptr, - this->GeneratorVerbose, 0); + res = cmSystemTools::RunSingleCommand( + dmgCmd.str().c_str(), &output, &output, &retVal, nullptr, + this->GeneratorVerbose, cmDuration::zero()); if (res && !retVal) { numTries = -1; break; @@ -467,7 +468,8 @@ bool cmCPackPackageMakerGenerator::RunPackageMaker(const char* command, std::string output; int retVal = 1; bool res = cmSystemTools::RunSingleCommand( - command, &output, &output, &retVal, nullptr, this->GeneratorVerbose, 0); + command, &output, &output, &retVal, nullptr, this->GeneratorVerbose, + cmDuration::zero()); cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Done running package maker" << std::endl); if (!res || retVal) { |