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/cmGlobalGenerator.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/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 47a9390..59158b0 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -21,6 +21,7 @@ #include "cmComputeTargetDepends.h" #include "cmCustomCommand.h" #include "cmCustomCommandLines.h" +#include "cmDuration.h" #include "cmExportBuildFileGenerator.h" #include "cmExternalMakefileProjectGenerator.h" #include "cmGeneratedFileStream.h" @@ -87,7 +88,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm) this->InstallTargetEnabled = false; // how long to let try compiles run - this->TryCompileTimeout = 0; + this->TryCompileTimeout = cmDuration::zero(); this->ExtraGenerator = nullptr; this->CurrentConfigureMakefile = nullptr; @@ -1801,7 +1802,7 @@ int cmGlobalGenerator::Build(const std::string& /*unused*/, const std::string& target, std::string& output, const std::string& makeCommandCSTR, const std::string& config, bool clean, bool fast, - bool verbose, double timeout, + bool verbose, cmDuration timeout, cmSystemTools::OutputOption outputflag, std::vector<std::string> const& nativeOptions) { |