summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-ctest-chrono'Brad King2017-12-1210-89/+42
|\ | | | | | | | | | | | | | | | | | | | | | | ba6caafa CTest: Use integer-representable value for "infinite" timeout 548e8f6f CTest: Simplify std::chrono::duration<double> conversion to double de0035fd cmCTestBuildAndTestHandler: Convert timeout to std::chrono::duration 687a26b7 CTest: Fix regression in build-and-test timeout forwarding e770b1b8 CTest: Fix regression in build-and-test timeout compuatation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: dublet <github@dublet.org> Merge-request: !1574
| * CTest: Use integer-representable value for "infinite" timeoutBrad King2017-12-114-25/+15
| | | | | | | | | | | | | | | | Refactoring in commit 66419bc046 (CTest: convert timeouts to std::chrono::duration, 2017-11-20) changed out "infinite" timeout to a value not representable by a 64-bit integer. This causes undefined behavior when e.g. KWSys Process converts the duration to a `long` to interact with system APIs. Use the old `1.0e7` maximum value.
| * CTest: Simplify std::chrono::duration<double> conversion to doubleBrad King2017-12-086-52/+13
| | | | | | | | | | | | | | | | | | The ratio of ticks to seconds for this type is 1, so we can just use its `count()` directly. This also avoids converting through the integer representation of `std::chrono::milliseconds`, which has a much smaller allowed range. Drop our `cmsysProcess_SetTimeout` wrapper as it is now very thin.
| * cmCTestBuildAndTestHandler: Convert timeout to std::chrono::durationBrad King2017-12-082-11/+11
| |
| * CTest: Fix regression in build-and-test timeout forwardingBrad King2017-12-081-0/+1
| | | | | | | | | | | | | | | | Refactoring in commit 66419bc046 (CTest: convert timeouts to std::chrono::duration, 2017-11-20) changed out "infinite" timeout to a value not representable by a 64-bit integer. Update the `--build-and-test` forwarding of `--test-timeout` to not forward an "infinite" timeout.
| * CTest: Fix regression in build-and-test timeout compuatationBrad King2017-12-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 66419bc046 (CTest: convert timeouts to std::chrono::duration, 2017-11-20) accidentally changed the logic used to compute the timeout for a test when it starts. It incorrectly limits the maximum possible timeout to 2 minutes rather than 2 minutes less than the total allowed test time remaining. Update the new logic to restore the original behavior. Avoid subtracting 2 minutes from our "infinite" timeout value to avoid creating very large timeouts that are not "infinite" and may exceed integer type ranges.
* | CMake Nightly Date StampKitware Robot2017-12-121-1/+1
| |
* | Merge topic 'cpack-generator-scripts-enable-all-cmake-policies'Brad King2017-12-113-73/+39
|\ \ | | | | | | | | | | | | | | | | | | 93d5f464 CPack: enable all CMake policies for generator scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1582
| * | CPack: enable all CMake policies for generator scriptsDomen Vrankar2017-12-093-73/+39
| | |
* | | Merge topic 'ctest-remove-unfinished-batch-mode'Brad King2017-12-118-172/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f984296b CTest: Remove unfinished batch test mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1577
| * | | CTest: Remove unfinished batch test modeBrad King2017-12-088-172/+1
| | | | | | | | | | | | | | | | | | | | This was partially implemented by commit v2.8.0~154 (Added some ctest batch capabilities, 2009-09-10) but never finished.
* | | | Merge topic 'update-kwsys'Brad King2017-12-111-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dee52ba Merge branch 'upstream-KWSys' into update-kwsys 3b1bb703 KWSys 2017-12-08 (2d27b1d0) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1576
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-12-081-4/+8
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-12-08 (2d27b1d0)
| | * | | KWSys 2017-12-08 (2d27b1d0)KWSys Upstream2017-12-081-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 2d27b1d075d93860ee63564f635fd1710aa61208 (master). Upstream Shortlog ----------------- Brad King (1): 9995f700 hashtable: Drop when building inside CMake
* | | | | CMake Nightly Date StampKitware Robot2017-12-111-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2017-12-101-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2017-12-091-1/+1
|/ / /
* | | Merge branch 'release-3.10'Brad King2017-12-080-0/+0
|\ \ \
| * \ \ Merge branch 'cuda_darwin_proper_install_names_flags' into release-3.10Brad King2017-12-081-0/+19
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1570
* | \ \ \ Merge topic 'cuda_darwin_proper_install_names_flags'Brad King2017-12-081-0/+19
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | ce3874b3 CUDA: Shared libraries on Darwin properly setup @rpath install_names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1570
| * | | | CUDA: Shared libraries on Darwin properly setup @rpath install_namesRobert Maynard2017-12-071-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared libraries linked with CUDA now properly setup booth the correct install_name but also specify headerpad_max_install_names so that the names can be changed post build.
* | | | | Merge branch 'release-3.10'Brad King2017-12-080-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'automoc-apple-framework' into release-3.10Brad King2017-12-079-24/+185
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1561
* | \ \ \ \ Merge topic 'autogen-fix-library-deps'Brad King2017-12-089-23/+184
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bc60334 Merge branch 'automoc-apple-framework' into autogen-fix-library-deps a3f8371c Merge branch 'automoc-apple-framework' into autogen-fix-library-deps bd49ae51 Autogen: Fix library dependency forwarding to _autogen target e4ccc684 Autogen: Tests: Add test for MacOS frameworks fcbd02fd Autogen: Fix for AUTOMOC on macOS frameworks in CMake 3.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1566
| * \ \ \ \ \ Merge branch 'automoc-apple-framework' into autogen-fix-library-depsBrad King2017-12-078-0/+162
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Autogen: Tests: Add test for MacOS frameworksSebastian Holtermann2017-12-078-0/+162
| | | | | | |
| * | | | | | Merge branch 'automoc-apple-framework' into autogen-fix-library-depsBrad King2017-12-070-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge using `-s ours` merge strategy because the change is a fix specific to the 3.10 release series, and we already have a similar fix in post-3.10 development.
| | * | | | | Autogen: Fix for AUTOMOC on macOS frameworks in CMake 3.10Sebastian Holtermann2017-12-071-24/+23
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the library target dependency forwarding to the `_autogen` target to the 3.9.6 way, only now using `GetLinkImplementationLibraries`. Fixes: #17278
| * | | | | Autogen: Fix library dependency forwarding to _autogen targetSebastian Holtermann2017-12-071-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library dependencies of the origin target were forwarded to the _autogen target as source file dependencies. This is fixed by forwarding the dependencies as target dependencies instead. Issue: #17278
* | | | | | Merge topic 'update-kwsys'Brad King2017-12-083-9/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c50f08cd Merge branch 'upstream-KWSys' into update-kwsys 5b1c84b4 KWSys 2017-12-07 (4aee0036) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1567
| * \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-12-073-9/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | * upstream-KWSys: KWSys 2017-12-07 (4aee0036)
| | * | | | KWSys 2017-12-07 (4aee0036)KWSys Upstream2017-12-073-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 4aee00361a2a38b99911318db84551eed8d3fcfc (master). Upstream Shortlog ----------------- Brad King (1): 09724ac8 hashtable: Avoid use of std::unary_function
* | | | | | CMake Nightly Date StampKitware Robot2017-12-081-1/+1
| | | | | |
* | | | | | Merge topic 'fix-ctest-chrono'Brad King2017-12-071-3/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be470278 CTest: Fix regression in test timeout compuatation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: dublet <github@dublet.org> Merge-request: !1568
| * | | | | CTest: Fix regression in test timeout compuatationBrad King2017-12-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 66419bc046 (CTest: convert timeouts to std::chrono::duration, 2017-11-20) accidentally changed the logic used to compute the timeout for a test when it starts. It incorrectly limits the maximum possible timeout to 2 minutes rather than 2 minutes less than the total allowed test time remaining. Update the new logic to restore the original behavior. Avoid subtracting 2 minutes from our "infinite" timeout value to avoid creating very large timeouts that are not "infinite" and may exceed integer type ranges.
* | | | | | Merge topic 'cpack-rpm-check-executable-flags'Brad King2017-12-077-9/+94
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2031d3a CPack/RPM: check executable flags for debuginfo packages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1565
| * | | | | | CPack/RPM: check executable flags for debuginfo packagesDomen Vrankar2017-12-067-9/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debuginfo packages can not be created from programs and shared libraries that do not have execute permissions.
* | | | | | | Merge topic 'externalproject_download_dir'Brad King2017-12-075-10/+69
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8b87489 ExternalProject: Support substituting <DOWNLOAD_DIR> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1537
| * | | | | | | ExternalProject: Support substituting <DOWNLOAD_DIR>Craig Scott2017-12-065-10/+69
| | | | | | | |
* | | | | | | | Merge topic 'FindOpenCL-amd-sdk'Brad King2017-12-071-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f313541a FindOpenCL: Add support for AMD OpenCL SDK Light Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1562
| * | | | | | | | FindOpenCL: Add support for AMD OpenCL SDK LightHarry Mallon2017-12-061-0/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'splitRCPatchComponent'Brad King2017-12-072-4/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f92304c7 CMakeVersion RC file: Split patch into 2 components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1552
| * | | | | | | | CMakeVersion RC file: Split patch into 2 componentsJustin Goshi2017-12-042-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The binary file version has 4 16-bit components. In cases where the patch component is too large (ex: represents a build date yyyymmdd) we split it into two parts.
* | | | | | | | | Merge branch 'release-3.10'Brad King2017-12-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'gtest-discovery-timeout' into release-3.10Brad King2017-12-079-4/+74
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1534
| * \ \ \ \ \ \ \ \ Merge branch 'backport-revert-server-target-backtraces' into release-3.10Brad King2017-12-064-95/+13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1564
* | \ \ \ \ \ \ \ \ \ Merge topic 'revert-server-target-backtraces'Brad King2017-12-074-108/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7100756 Merge branch 'backport-revert-server-target-backtraces' into revert-server-target-backtraces 976370d1 server: drop "ctestInfo" backtrace information 8b2736c7 server: Revert "Report backtraces in codemodel response" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1564
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-revert-server-target-backtraces' into ↵Brad King2017-12-064-94/+13
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | revert-server-target-backtraces
| | * | | | | | | | | | server: Revert "Report backtraces in codemodel response"Brad King2017-12-064-95/+13
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backtrace information is very repetitive and hugely increases the size of the codemodel object. We need to remove it until an alternative representation can be developed. Revert commit v3.10.0-rc1~393^2 (server: Report backtraces in codemodel response, 2017-06-20), except for the protocol version number (because it indicates other new things). Unfortunately this is incompatible with clients that expect the "crossReferences" field in targets. However, the regression in memory usage is quite serious, especially on large projects, and therefore breaks even older clients that do not use backtraces. Since the "crossReferences" field was only provided by one release (3.10.0), it is simplest to revert it outright for 3.10.1. Fixes: #17502
| * | | | | | | | | | server: drop "ctestInfo" backtrace informationBrad King2017-12-062-14/+0
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backtrace information was included by commit 35a52bd1b4 (server: add "ctestInfo" request to get test info, 2017-10-25) to match that already provided for targets. However, the backtrace representation uses too much memory and needs to be dropped. Remove it from test information. Issue: #17502
generated by cgit v0.12 at 2025-02-09 18:39:28 (GMT)