summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.23'Brad King2022-03-040-0/+0
|\
| * Merge branch 'release-3.22' into release-3.23Brad King2022-03-041-0/+9
| |\
* | \ Merge branch 'release-3.22'Brad King2022-03-041-0/+9
|\ \ \ | | |/ | |/|
| * | CMake 3.22.3v3.22.3Brad King2022-03-042-1/+10
| | |
* | | Merge branch 'release-3.23'Brad King2022-03-040-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-3.22' into release-3.23Brad King2022-03-041-3/+3
| |\ \ | | |/
* | | Merge branch 'release-3.22'Brad King2022-03-040-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'release-3.21' into release-3.22Brad King2022-03-041-3/+3
| |\ \
* | \ \ Merge branch 'release-3.21'Brad King2022-03-041-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | CMake 3.21.6v3.21.6Brad King2022-03-042-4/+4
| | | |
* | | | Merge branch 'release-3.23'Brad King2022-03-040-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'file-set-name-requirements' into release-3.23Brad King2022-03-048-4/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b357d334fc target_sources(): Enforce stricter requirements for FILE_SET name Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7037
* | \ \ \ Merge topic 'file-set-name-requirements'Brad King2022-03-048-4/+30
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | b357d334fc target_sources(): Enforce stricter requirements for FILE_SET name Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7037
| * | | | target_sources(): Enforce stricter requirements for FILE_SET nameKyle Edwards2022-03-038-4/+30
| | | | | | | | | | | | | | | | | | | | Fixes: #23286
* | | | | Merge branch 'release-3.23'Brad King2022-03-040-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'file-set-multiple-names' into release-3.23Brad King2022-03-043-12/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c23ecbd93 target_sources(): Process multiple FILE_SET arguments per block Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7040
* | \ \ \ \ Merge topic 'file-set-multiple-names'Brad King2022-03-043-12/+40
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c23ecbd93 target_sources(): Process multiple FILE_SET arguments per block Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7040
| * | | | | target_sources(): Process multiple FILE_SET arguments per blockKyle Edwards2022-03-033-12/+40
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #23287
* | | | | Merge branch 'release-3.23'Brad King2022-03-040-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'ci-cuda-11.6' into release-3.23Brad King2022-03-049-3/+136
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f601753d7 gitlab-ci: add jobs testing cuda11.6 with nvcc and clang 13 7716750062 ci: add cuda11.6 base image 77bdcc949d gitlab-ci: run CUDA and HIP test jobs in any non-MR pipeline Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7038
* | \ \ \ \ Merge topic 'ci-cuda-11.6'Brad King2022-03-049-3/+136
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f601753d7 gitlab-ci: add jobs testing cuda11.6 with nvcc and clang 13 7716750062 ci: add cuda11.6 base image 77bdcc949d gitlab-ci: run CUDA and HIP test jobs in any non-MR pipeline Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7038
| * | | | | gitlab-ci: add jobs testing cuda11.6 with nvcc and clang 13Brad King2022-03-035-0/+50
| | | | | |
| * | | | | ci: add cuda11.6 base imageBrad King2022-03-034-0/+83
| | | | | |
| * | | | | gitlab-ci: run CUDA and HIP test jobs in any non-MR pipelineBrad King2022-03-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we only ran these in a scheduled nightly pipeline. We should run them in pipelines on integration branches too, particularly for the `release` branch.
* | | | | | Merge branch 'release-3.23'Brad King2022-03-040-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'release-3.22' into release-3.23Brad King2022-03-040-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'release-3.22'Brad King2022-03-040-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'while-bug-compatibility' into release-3.22Brad King2022-03-037-27/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !7041
| * \ \ \ \ \ Merge branch 'release-3.21' into release-3.22Brad King2022-03-030-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'binutils-llvm-ar-clang-macos' into release-3.22Brad King2022-03-031-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7039
* | \ \ \ \ \ \ Merge branch 'release-3.21'Brad King2022-03-040-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'binutils-llvm-ar-clang-macos' into release-3.21Brad King2022-03-031-1/+4
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Merge-request: !7039
* | | | | | | | Merge branch 'release-3.23'Brad King2022-03-040-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'while-bug-compatibility' into release-3.23Brad King2022-03-047-27/+20
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da2361ffb3 while: Restore tolerance of condition error 47d197745a Tests: Simplify RunCMake.{if,while} unbalanced parenthesis cases Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7041
* | | | | | | | Merge topic 'while-bug-compatibility'Brad King2022-03-047-27/+20
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da2361ffb3 while: Restore tolerance of condition error 47d197745a Tests: Simplify RunCMake.{if,while} unbalanced parenthesis cases Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7041
| * | | | | | | while: Restore tolerance of condition errorAlex Turbov2022-03-035-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 880ca66b51 (Fix: `while()` can silently ignore incorrect condition, 2021-08-09, v3.22.0-rc1~238^2~4) we correctly reject the code set(paren "(") while(${paren}) endwhile() However, rejecting it breaks compatibility with projects that used such code accidentally. In CMake 3.21 and below, any error in the condition was ignored because the `false` result exited the loop first. Restore tolerance of the error for now. A policy will be needed to make it an error later. Note that the same condition with `if` was always correctly rejected. Fixes: #22524 Issue: #23296 Co-authored-by: Brad King <brad.king@kitware.com>
| * | | | | | | Tests: Simplify RunCMake.{if,while} unbalanced parenthesis casesBrad King2022-03-034-16/+11
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'release-3.23'Brad King2022-03-040-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'binutils-llvm-ar-clang-macos' into release-3.23Brad King2022-03-041-1/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | / / | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 29ea94e17c BinUtils: Avoid llvm-ar on Apple platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7039
* | | | | | Merge topic 'binutils-llvm-ar-clang-macos'Brad King2022-03-041-1/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 29ea94e17c BinUtils: Avoid llvm-ar on Apple platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7039
| * | | | | BinUtils: Avoid llvm-ar on Apple platformsBrad King2022-03-031-1/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit cf82300a63 (BinUtils: Clarify search logic and make it more consistent, 2021-05-27, v3.21.0-rc1~119^2~2) we correctly prefer the more-specific name `llvm-ar` over `ar` when using Clang. However, on Apple platforms, `llvm-ar` does not generate a symbol table that the Apple linker accepts. Fall back to `ar` on Apple platforms. Fixes: #23269
* | | | | CMake Nightly Date StampKitware Robot2022-03-041-1/+1
| | | | |
* | | | | Merge branch 'release-3.23'Brad King2022-03-030-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'cuda-arch-all' into release-3.23Brad King2022-03-037-5/+27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dae3ad08fa Tests: Add cases for CMAKE_CUDA_ARCHITECTURES={all,all-major} 5c1f5357b0 VS: Fix CUDA compiler id with CMAKE_CUDA_ARCHITECTURES={all,all-major} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7035
* | \ \ \ \ Merge topic 'cuda-arch-all'Brad King2022-03-037-5/+27
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dae3ad08fa Tests: Add cases for CMAKE_CUDA_ARCHITECTURES={all,all-major} 5c1f5357b0 VS: Fix CUDA compiler id with CMAKE_CUDA_ARCHITECTURES={all,all-major} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7035
| * | | | | Tests: Add cases for CMAKE_CUDA_ARCHITECTURES={all,all-major}Brad King2022-03-025-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CudaOnly.All` test only sets these in project code after CUDA is enabled. Add another case to test the values during compiler detection. Issue: #23161
| * | | | | VS: Fix CUDA compiler id with CMAKE_CUDA_ARCHITECTURES={all,all-major}Brad King2022-03-022-5/+9
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip the architecture verification check for these values on Visual Studio. It cannot be implemented correctly until future work delays the check to the main compiler test step. Issue: #23164, #23161
* | | | | Merge branch 'release-3.23'Brad King2022-03-030-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'cmake-dir-args' into release-3.23Brad King2022-03-0350-31/+85
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2e9478321 Tests: Add RunCMake.CommandLine ExplicitiDirs explicit work directory 78e8f11456 cmake: Correct regression in `-B <dir> <src_dir>` 4091d5c58c Tests: Verify RunCMake.CommandLine ExplicitDirs source/build dirs 1b97f8f35c Tests: Clarify RunCMake.CommandLine ExplicitDirs case names Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7030
* | \ \ \ \ Merge topic 'cmake-dir-args'Brad King2022-03-0350-31/+85
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2e9478321 Tests: Add RunCMake.CommandLine ExplicitiDirs explicit work directory 78e8f11456 cmake: Correct regression in `-B <dir> <src_dir>` 4091d5c58c Tests: Verify RunCMake.CommandLine ExplicitDirs source/build dirs 1b97f8f35c Tests: Clarify RunCMake.CommandLine ExplicitDirs case names Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7030