summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CTest: adopt std::chrono::system_clockWouter Klouwen2017-11-1710-33/+44
| | | | | | | | | | | | | | | | | | After the refactor to make CTest use std::chrono::steady_clock for the keeping of time for test duration, there are still references to cmSystemTools::GetTime() left. To further adopt std::chrono for time related activities, this commit changes those remaining references to std::chrono::system_clock::now() calls and alters the storage from either unsigned int or double to std::chrono::system_clock::time_point. For ease of conversion, a converter method is added to cmXMLWriter that converts from a std::chrono::system_clock::time_point to the number of seconds since the UN*X epoch as that is expected behaviour. This means no more casts as required. Functionally should be no difference as the system_clock is implemented in the same terms.
* Merge topic 'ctest-chrono'Brad King2017-11-1515-96/+155
|\ | | | | | | | | | | | | e8a4036e CTest: use std::chrono::steady_clock for time keeping Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1445
| * CTest: use std::chrono::steady_clock for time keepingWouter Klouwen2017-11-1415-96/+155
| | | | | | | | | | | | | | | | | | | | | | | | It was reported in issue #17345 that CTest does not use monotonic time to report test duration. Monotonic clocks are not affected by large NTP adjustments or things like daylight savings time. As CMake 3.10 requires C++11, which introduced std::chrono, this commit moves the time keeping in CTest from cmSystemTools::GetTime() to std::chrono::steady_clock. Fixes: #17345
* | Merge topic 'update-prebuilt-openssl'Brad King2017-11-151-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | b40d45cd Utilities/Release: Update to openssl-1.1.0g 78aeb300 Utilities/Release: Update to openssl-1.0.2m Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1478
| * | Utilities/Release: Update to openssl-1.1.0gBrad King2017-11-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version. Now that we require pthreads for libuv anyway, we can use OpenSSL 1.1 along with its dependency on pthreads.
| * | Utilities/Release: Update to openssl-1.0.2mBrad King2017-11-141-3/+3
| | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | CMake Nightly Date StampKitware Robot2017-11-151-1/+1
|/ /
* | Merge topic 'rel-win-static'Brad King2017-11-143-14/+36
|\ \ | | | | | | | | | | | | | | | | | | | | | 313a5657 Utilities/Release: Build static executables on Windows a12830c2 Utilities/Release: Remove unused setting in Linux build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1477
| * | Utilities/Release: Build static executables on WindowsBrad King2017-11-142-13/+36
| | | | | | | | | | | | | | | | | | | | | Switch to the MSVC static runtime library (and static UCRT). Link Qt statically, including the Windows platform plugin. Disable the Qt tests because they are incompatible with a Qt using a static runtime library.
| * | Utilities/Release: Remove unused setting in Linux buildBrad King2017-11-141-1/+0
| | | | | | | | | | | | | | | CMake_INSTALL_DEPENDENCIES is not needed because we link both Qt and the toolchain runtime library statically.
* | | Merge branch 'release-3.10'Brad King2017-11-140-0/+0
|\ \ \ | |/ / |/| |
| * | Merge branch 'cmake-gui-qt-static-windows' into release-3.10Brad King2017-11-143-5/+23
| |\ \ | | | | | | | | | | | | Merge-request: !1476
* | \ \ Merge topic 'cmake-gui-qt-static-windows'Brad King2017-11-143-5/+23
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 3a993c49 Tests: Add options to disable tests requiring Qt 27a73f16 cmake-gui: Add build option to use Qt5 windows plugin statically Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1476
| * | | Tests: Add options to disable tests requiring QtBrad King2017-11-131-4/+12
| | | |
| * | | cmake-gui: Add build option to use Qt5 windows plugin staticallyBrad King2017-11-132-1/+11
| |/ / | | | | | | | | | This will enable builds against a static Qt5 on Windows.
* | | Merge topic 'xcode64'Brad King2017-11-141-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 23dd8b9e cmGlobalXCodeGenerator: Support XCTest for XCode 6.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1471
| * | | cmGlobalXCodeGenerator: Support XCTest for XCode 6.4Benito Palacios Sanchez2017-11-091-2/+2
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-11-141-1/+1
| |_|/ |/| |
* | | Merge topic 'ctest-warning'Brad King2017-11-131-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec2f9012 CTest: correct misleading warning message for RUN_SERIAL tests Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Zack Galbreath <zack.galbreath@kitware.com> Merge-request: !1469
| * | | CTest: correct misleading warning message for RUN_SERIAL testsWouter Klouwen2017-11-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported in issue 17167, when only RUN_SERIAL tests remain, CTest can display a misleading message that it is waiting for the load to come down when in fact, it cannot start any new tests. This commit fixes that by determining whether this circumstance is what's happening and adds an additional warning message in this case.
* | | | Merge topic 'swig-broken-dependency-scan'Brad King2017-11-131-1/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ee10119 swig: fix incremental build in case of removed interface files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1457
| * | | | swig: fix incremental build in case of removed interface filesFelix Schwitzer2017-11-081-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.8.0-rc1~123^2 (UseSWIG: Automatically scan dependencies of SWIG files for Makefiles, 2016-12-21) introduced automatic dependency scanning for files `%include`d in a swig interface definition file. This works fine as long as no such file is removed. But removing a dependent file breaks an incremental build and `make` complains about a missing dependency, see #16830. Integrate the approach proposed in the issue above into the SWIG-module, do the workaround in a conditional step as it arises only for Makefile generators. For other generators use the implementation before that commit. Fixes: #17433.
* | | | | Merge topic 'xcodeForLoopCleanup'Brad King2017-11-134-190/+122
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98cbcedd Xcode: use ranged for loops, cleanup existing for loops Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1456
| * | | | | Xcode: use ranged for loops, cleanup existing for loopsCraig Scott2017-11-104-190/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes are mostly converting old-style explicit iterator for loops into ranged for statements. A number of for loops had already been changed over, but local variables had been left behind instead of being absorbed into the ranged for statement, so these have been cleaned up too. A couple of minor improvements were made in areas already being updated by the for loop changes to slightly simplify the code or to avoid unnecessary conversions between `const char*` and `std::string`.
* | | | | | CMake Nightly Date StampKitware Robot2017-11-131-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-11-121-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-11-111-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.10'Brad King2017-11-100-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | CMake 3.10.0-rc5v3.10.0-rc5Brad King2017-11-101-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.10'Brad King2017-11-100-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'windows-mt-update-quiet' into release-3.10Brad King2017-11-101-14/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1470 Merge-request: !1473
| | * | | | | Windows: Do not report manifest tool update notification as failureBrad King2017-11-101-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A diagnostic message added in commit v3.10.0-rc1~59^2 (Windows: Improve link-time error messages when rc or mt fail, 2017-09-22) incorrectly reports the `mt /notify_update` special return code as a failure. Fix the logic to consider the special return codes as success. Fixes: #17444
| * | | | | | Merge branch 'doxygen_dot' into release-3.10Brad King2017-11-101-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1472
* | \ \ \ \ \ \ Merge topic 'windows-mt-update-quiet'Brad King2017-11-101-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c07d390 cmcmd: Fix typo in RunCommand logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1473
| * | | | | | | | cmcmd: Fix typo in RunCommand logicBrad King2017-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit 18eae3f04d (Windows: Do not report manifest tool update notification as failure, 2017-11-09). Issue: #17444
* | | | | | | | | Merge topic 'doxygen_dot'Brad King2017-11-101-1/+5
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cab8570 FindDoxygen: Fix setting of HAVE_DOT in non-backward-compat mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1472
| * | | | | | | | FindDoxygen: Fix setting of HAVE_DOT in non-backward-compat modeAndré Apitzsch2017-11-101-1/+5
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `DOXYGEN_DOT_FOUND` is only set if `_Doxygen_keep_backward_compat` is used (when no components are requested), so use `Doxygen_dot_FOUND` directly. Preserve the "YES" or "NO" value used previously.
* | | | | | | | Merge branch 'release-3.9'Brad King2017-11-100-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | CMake 3.9.6v3.9.6Brad King2017-11-101-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'update-ctest-documentation'Brad King2017-11-105-128/+167
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b272ff8 Help: Add 'Label and Subproject Summary' section to ctest(1) manual 002d0a1c Help: Normalize capitalization of 'CTest' in ctest(1) manual 9d3aa95c Help: Divide ctest(1) manual options into sections 7904b659 Tests: Remove incorrect use of 'test-timeout' option e80dc2ad cmCTest: Remove dead code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1427
| * | | | | | | | | Help: Add 'Label and Subproject Summary' section to ctest(1) manualBetsy McPhail2017-11-101-1/+27
| | | | | | | | | |
| * | | | | | | | | Help: Normalize capitalization of 'CTest' in ctest(1) manualBetsy McPhail2017-11-101-24/+24
| | | | | | | | | |
| * | | | | | | | | Help: Divide ctest(1) manual options into sectionsBetsy McPhail2017-11-101-87/+114
| | | | | | | | | |
| * | | | | | | | | Tests: Remove incorrect use of 'test-timeout' optionBetsy McPhail2017-11-101-1/+1
| | | | | | | | | |
| * | | | | | | | | cmCTest: Remove dead codeBetsy McPhail2017-11-074-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option 'ctest-config' is ignored.
* | | | | | | | | | Merge topic 'cmakeServerRequiredCMakeVersion'Brad King2017-11-103-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdf5f34b server: return minimum cmake required version for each project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1462
| * | | | | | | | | | server: return minimum cmake required version for each projectJustin Goshi2017-11-073-0/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'csharp-settings-property'Brad King2017-11-101-6/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15892aa3 VS: Fix warnings in generated references to '.settings' files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1450
| * | | | | | | | | | VS: Fix warnings in generated references to '.settings' filesYoshinori Tahara2017-11-091-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to MSDN docs [1], LastGenOutput is just a file name. [1] https://msdn.microsoft.com/en-us/library/bb629388.aspx
* | | | | | | | | | | Merge topic 'test-CTestTest2-intl'Brad King2017-11-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ffb9cb8 Tests: In CTestTest2 configure KWSys encoding to match CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1468