diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-26 13:27:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-26 13:27:37 (GMT) |
| commit | f343106b19eec139764dc965f9110f503aafbf9c (patch) | |
| tree | 2ad40ae416e4db8bad3c005f4650ad4d2c56f61c /Source/cmake.cxx | |
| parent | b50fb70be8eb629083eb2ad2e0b413793bbdde06 (diff) | |
| parent | e6a80ccfc440ac8dd5e9e5405744c2423560fc02 (diff) | |
| download | CMake-f343106b19eec139764dc965f9110f503aafbf9c.zip CMake-f343106b19eec139764dc965f9110f503aafbf9c.tar.gz CMake-f343106b19eec139764dc965f9110f503aafbf9c.tar.bz2 | |
Merge topic 'ctest-chrono'
e6a80ccf Make use of std::chrono throughout every component
ff62b005 CTest: add safe conversion from cmDuration to integer types
695951bc CTest: introduce cmDuration
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1592
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index cefea27..f488552 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -7,6 +7,7 @@ #include "cmDocumentation.h" #include "cmDocumentationEntry.h" #include "cmDocumentationFormatter.h" +#include "cmDuration.h" #include "cmExternalMakefileProjectGenerator.h" #include "cmFileTimeComparison.h" #include "cmGeneratorTarget.h" @@ -2465,8 +2466,8 @@ int cmake::Build(const std::string& dir, const std::string& target, #endif return gen->Build("", dir, projName, target, output, "", config, clean, - false, verbose, 0, cmSystemTools::OUTPUT_PASSTHROUGH, - nativeOptions); + false, verbose, cmDuration::zero(), + cmSystemTools::OUTPUT_PASSTHROUGH, nativeOptions); } bool cmake::Open(const std::string& dir, bool dryRun) |