summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-04-149-191/+503
|\ | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-04-14 (7ab1c601)
| * KWSys 2021-04-14 (7ab1c601)KWSys Upstream2021-04-149-191/+503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 7ab1c60177e76707fbdd462fdbf7304ad2532edc (master). Upstream Shortlog ----------------- Brad King (11): 85e76a10 Status: Add class to hold an OS-specific status of a system operation eec0add2 Directory: Return Status from Load 955e7c1e SystemTools: Return Status from RemoveFile and RemoveADirectory c5a99e59 SystemTools: Return Status from GetPermissions and SetPermissions fadfd7a0 SystemTools: Return Status from Touch 06216f0b SystemTools: Return Status from FileTimeCompare ab198a22 SystemTools: Return Status from GetShortPath 2446b205 SystemTools: Return Status from MakeDirectory 6aec6af9 SystemTools: Return Status from ChangeDirectory 0664553b SystemTools: Return Status from copy operations a95f61cf SystemTools: Return Status from symlink operations
* | Merge branch 'release-3.20'Brad King2021-04-140-0/+0
|\ \
| * \ Merge topic 'openbsd-defines' into release-3.20Brad King2021-04-144-10/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 317a477283 OpenBSD: Fix system feature definitions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6000
* | \ \ Merge topic 'openbsd-defines'Brad King2021-04-144-10/+9
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 317a477283 OpenBSD: Fix system feature definitions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6000
| * | | OpenBSD: Fix system feature definitionsRafael Sadowski2021-04-144-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f034b0f663 (CMake compilation: do not use compiler extensions, 2020-03-14, v3.18.0-rc1~494^2), some sources explicitly enable needed system APIs on some platforms using definitions like `_POSIX_C_SOURCE` and `_XOPEN_SOURCE`. Drop the definitions for OpenBSD, which provides the POSIX APIs by default.
* | | | Merge topic 'add_custom_command-DEPFILE-genex'Brad King2021-04-1411-12/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c47b91fcc Genex: add_custom_command: DEPFILE supports genex Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5998
| * | | | Genex: add_custom_command: DEPFILE supports genexMarc Chevrier2021-04-1211-12/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This facility is very useful for 'Ninja Multi-Config' and required as well for future support of DEPFILE in 'Xcode' and 'Visual Studio' generators (#20286).
* | | | | Merge topic 'vs-autouic-on-ui-file-change'Brad King2021-04-142-40/+80
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8d879cf45 Autogen: Add detection of UI file changes to the pre-build VS case 1876f2d03f Autogen: Move duplicated filename generation code into a function 087b717aef Autogen: Move duplicated executable dependency code into a function 0656bebeae Autogen: Rename the variable for UI files with UIC options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5999
| * | | | | Autogen: Add detection of UI file changes to the pre-build VS caseDuncan Barber2021-04-102-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is achieved by adding a rule file which carries the UI files as dependencies but performs no meaningful command. Its output path points to a timestamp file which is instead touched by the pre-build command that runs autogen. The rule file therefore triggers the build if any of the files have been changed more recently than the last autogen run. Fixes: #17959 Fixes: #18741
| * | | | | Autogen: Move duplicated filename generation code into a functionDuncan Barber2021-04-102-26/+23
| | | | | |
| * | | | | Autogen: Move duplicated executable dependency code into a functionDuncan Barber2021-04-101-10/+13
| | | | | |
| * | | | | Autogen: Rename the variable for UI files with UIC optionsDuncan Barber2021-04-102-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Monitoring for UI file changes in the target sources will require keeping track of the files without options as well so this will improve clarity.
* | | | | | Merge branch 'release-3.20'Brad King2021-04-140-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'ci-parallelism-limits' into release-3.20Brad King2021-04-143-4/+16
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fd2cffb4d ci: limit builds by machine load 6317f92120 ci: pay attention to the machine load when running tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5989
* | | | | | Merge topic 'ci-parallelism-limits'Brad King2021-04-143-4/+16
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fd2cffb4d ci: limit builds by machine load 6317f92120 ci: pay attention to the machine load when running tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5989
| * | | | | ci: limit builds by machine loadBen Boeckel2021-04-062-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid starving test jobs, the build jobs should also back off if there is a lot of machine load.
| * | | | | ci: pay attention to the machine load when running testsBen Boeckel2021-04-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake's test suite is sensitive to machine load and can cause spurious timeouts. To acknowledge this, prevent CTest from spawning tests into a busy machine.
* | | | | | CMake Nightly Date StampKitware Robot2021-04-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2021-04-131-1/+1
| |_|_|/ / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2021-04-121-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2021-04-111-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2021-04-101-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2021-04-091-1/+1
| | | |
* | | | Merge branch 'release-3.20'Brad King2021-04-080-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | CMake 3.20.1v3.20.1Brad King2021-04-081-1/+1
| | | |
* | | | Merge topic 'newer-git-show'Brad King2021-04-081-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f71e7b8156 Help/dev/review: mention `--pretty=reference` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5994
| * | | | Help/dev/review: mention `--pretty=reference`Ben Boeckel2021-04-071-1/+2
| | | | | | | | | | | | | | | | | | | | This was added in Git 2.25 (13 Jan 2020).
* | | | | Merge topic 'presets-optional-generator-and-builddir'Brad King2021-04-0812-26/+80
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e6981336 cmake-presets: Make generator and binaryDir fields optional Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5946
| * | | | | cmake-presets: Make generator and binaryDir fields optionalfriendlyanon2021-04-0612-26/+80
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In v3 of the presets, generator and buildDir can be omitted to fall back to regular cmake behavior when these values are not explicitly provided by the user. Fixes: #21987
* | | | | Merge topic 'ctest-wait-verbosity'Brad King2021-04-0814-20/+113
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82e40607a4 ctest: Display test "WAITING" messages only in extra-verbose mode 80da23f2a2 Tests: Add RunCTest helper option to control CTest verbose flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5990
| * | | | | ctest: Display test "WAITING" messages only in extra-verbose modeBrad King2021-04-0613-19/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These messages are incidental scheduling output. Avoid cluttering the normal verbose output showing tests starting and finishing.
| * | | | | Tests: Add RunCTest helper option to control CTest verbose flagBrad King2021-04-061-1/+4
| | | | | |
* | | | | | Merge topic 'find_threads_only_log_on_failure'Brad King2021-04-081-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6da6784bf FindThreads: Reduce amount of false positive error logging Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5988
| * | | | | | FindThreads: Reduce amount of false positive error loggingRobert Maynard2021-04-061-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a CMake based project fails, users start looking at CMakeError.log and think that the FindThread output is the problem, but it is a false positive. Now FindThreads only logs to `CMakeError.log` when it fails to find a suitable flag, reducing the amount of false positives in `CMakeError.log`. Fixes #16540, Fixes #19344
* | | | | | | Merge branch 'release-3.20'Brad King2021-04-080-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'flags-with-backslash' into release-3.20Brad King2021-04-088-5/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3953dfcb31 Restore support for backslashes in initial language-wide flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5995
* | \ \ \ \ \ \ Merge topic 'flags-with-backslash'Brad King2021-04-088-5/+25
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3953dfcb31 Restore support for backslashes in initial language-wide flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5995
| * | | | | | | Restore support for backslashes in initial language-wide flagsBrad King2021-04-078-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit bdc40742bd (CMakeDetermineCompilerId: Test without COMPILER_ID_FLAGS if REQUIRE_SUCCESS, 2021-02-27, v3.20.0-rc3~6^2) added an extra macro layer through which flag strings are passed. That caused an extra level of argument re-parsing, and broke flags with backslashes. Pass flags to the helper macro through variable names instead. Fixes: #22041
* | | | | | | | Merge branch 'release-3.20'Brad King2021-04-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cuda-depfile-ccbin' into release-3.20Brad King2021-04-082-1/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e38985db7 Makefiles: Fix dependency extraction with CUDA < 10.2 and host compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Merge-request: !5992
* | \ \ \ \ \ \ \ Merge topic 'cuda-depfile-ccbin'Brad King2021-04-082-1/+12
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e38985db7 Makefiles: Fix dependency extraction with CUDA < 10.2 and host compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Merge-request: !5992
| * | | | | | | | Makefiles: Fix dependency extraction with CUDA < 10.2 and host compilerBrad King2021-04-072-1/+12
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2c71d051fa (Makefiles Generators: use compiler for dependencies generation, 2020-10-18, v3.20.0-rc1~392^2) we invoke `nvcc` for CUDA < 10.2 a second time in order to generate a depfile. When `CMAKE_CUDA_HOST_COMPILER` is set, the second invocation is missing its `-ccbin=` option, even after refactoring in commit 8981e3e7cc (NVIDIA-CUDA: rely on new capabilities for deps generation, 2020-12-02, v3.20.0-rc1~362^2). Ideally we should move the `-ccbin=` flag into `Compiler/NVIDIA-CUDA`, but that will add `CMAKE_CUDA_HOST_COMPILER` support on Windows in command-line generators but not the Visual Studio generators. For now, add the flag to the depfile command specifically. Fixes: #22037
* | | | | | | | Merge branch 'release-3.20'Brad King2021-04-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'FindBLAS-default-OpenMP' into release-3.20Brad King2021-04-081-2/+11
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ef82d95d8 FindBLAS: Fix detection of OpenMP as dependency of BLA_STATIC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5993
* | | | | | | | Merge topic 'FindBLAS-default-OpenMP'Brad King2021-04-081-2/+11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ef82d95d8 FindBLAS: Fix detection of OpenMP as dependency of BLA_STATIC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5993
| * | | | | | | FindBLAS: Fix detection of OpenMP as dependency of BLA_STATICBrad King2021-04-071-2/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the change from commit f7f3d8987a (FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATIC, 2020-11-10, v3.20.0-rc1~492^2): * If C is not enabled, find CXX OpenMP libraries instead. * Do not use BLA_STATIC's custom CMAKE_FIND_LIBRARY_SUFFIXES for OpenMP. It can break projects that already call `find_package(OpenMP)` and expect a shared library. Whether OpenMP is static is orthogonal to whether BLAS is static. Fixes: #22039 Issue: #16221
* | | | | | | CMake Nightly Date StampKitware Robot2021-04-081-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.20'Brad King2021-04-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge topic 'binutils-var-private' into release-3.20Brad King2021-04-071-10/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d786dfcfa BinUtils: Avoid clobbering a variable named without a private prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5986