mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-21 07:18:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
56,588 Commits 2 Branches 401 Tags
8895284e115648ecfed020af2e55403341f3dd76
Commit Graph

56588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 8895284e11 Merge branch 'release-3.23' 2022-03-04 12:52:44 -05:00
Brad King 7a8536e0ea Merge branch 'release-3.22' into release-3.23 2022-03-04 12:52:28 -05:00
Brad King 4dfc166976 Merge branch 'release-3.22' 2022-03-04 12:52:03 -05:00
Brad King 6e9eaf209d CMake 3.22.3 v3.22.3 2022-03-04 12:06:35 -05:00
Brad King bbc42613b1 Merge branch 'release-3.23' 2022-03-04 11:56:01 -05:00
Brad King 5d4edcca4f Merge branch 'release-3.22' 2022-03-04 11:55:55 -05:00
Brad King 41d13ade7c Merge branch 'release-3.22' into release-3.23 2022-03-04 11:54:54 -05:00
Brad King e7c9304504 Merge branch 'release-3.21' into release-3.22 2022-03-04 11:54:30 -05:00
Brad King 76096a0ef4 Merge branch 'release-3.21' 2022-03-04 11:46:13 -05:00
Brad King 78ae759e01 CMake 3.21.6 v3.21.6 2022-03-04 10:52:43 -05:00
Brad King a950fd9553 Merge branch 'release-3.23' 2022-03-04 09:09:33 -05:00
Brad King 89457cb8f0 Merge topic 'file-set-name-requirements' 
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
 2022-03-04 09:09:33 -05:00
Brad King 65da32c924 Merge topic 'file-set-name-requirements' into release-3.23 
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
 2022-03-04 09:09:31 -05:00
Brad King d79f67e3d6 Merge branch 'release-3.23' 2022-03-04 09:07:04 -05:00
Brad King 0d8bb14344 Merge topic 'file-set-multiple-names' 
8c23ecbd93 target_sources(): Process multiple FILE_SET arguments per block

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7040
 2022-03-04 09:07:04 -05:00
Brad King 31743aaf5d Merge topic 'file-set-multiple-names' into release-3.23 
8c23ecbd93 target_sources(): Process multiple FILE_SET arguments per block

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7040
 2022-03-04 09:07:03 -05:00
Brad King 376c2dbe3a Merge branch 'release-3.23' 2022-03-04 09:02:25 -05:00
Brad King 8aeabc9d6a Merge topic 'ci-cuda-11.6' 
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
 2022-03-04 09:02:25 -05:00
Brad King 8074e46a5c Merge topic 'ci-cuda-11.6' into release-3.23 
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
 2022-03-04 09:02:24 -05:00
Brad King ad814fd599 Merge branch 'release-3.23' 2022-03-04 08:56:50 -05:00
Brad King 75bab9cda6 Merge branch 'release-3.22' 2022-03-04 08:56:48 -05:00
Brad King 63d77ceeb0 Merge branch 'release-3.21' 2022-03-04 08:56:47 -05:00
Brad King 2d0b70fbbe Merge branch 'release-3.22' into release-3.23 2022-03-04 08:56:21 -05:00
Brad King 56d774b0e5 Merge branch 'release-3.23' 2022-03-04 08:53:17 -05:00
Brad King bb2477081d Merge topic 'while-bug-compatibility' 
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
 2022-03-04 08:53:17 -05:00
Brad King d7febfc727 Merge topic 'while-bug-compatibility' into release-3.23 
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
 2022-03-04 08:53:16 -05:00
Brad King 424d04ed51 Merge branch 'release-3.23' 2022-03-04 08:52:06 -05:00
Brad King 4c68c59117 Merge topic 'binutils-llvm-ar-clang-macos' 
29ea94e17c BinUtils: Avoid llvm-ar on Apple platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7039
 2022-03-04 08:52:06 -05:00
Brad King 71a8b4e63d Merge topic 'binutils-llvm-ar-clang-macos' into release-3.23 
29ea94e17c BinUtils: Avoid llvm-ar on Apple platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7039
 2022-03-04 08:52:05 -05:00
Kitware Robot 5450255579 CMake Nightly Date Stamp 2022-03-04 00:01:14 -05:00
Brad King 5419cc3b8b Merge branch 'while-bug-compatibility' into release-3.22 
Merge-request: !7041
 2022-03-03 16:54:35 -05:00
Alex Turbov da2361ffb3 while: Restore tolerance of condition error 
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>
 2022-03-03 16:51:34 -05:00
Brad King 47d197745a Tests: Simplify RunCMake.{if,while} unbalanced parenthesis cases 2022-03-03 16:51:34 -05:00
Kyle Edwards 8c23ecbd93 target_sources(): Process multiple FILE_SET arguments per block 
Fixes: #23287
 2022-03-03 14:31:54 -05:00
Brad King 4331f97118 Merge branch 'release-3.21' into release-3.22 2022-03-03 12:58:14 -05:00
Brad King 7edc09b4f6 Merge branch 'binutils-llvm-ar-clang-macos' into release-3.22 
Merge-request: !7039
 2022-03-03 12:58:00 -05:00
Brad King e47e5c7959 Merge branch 'binutils-llvm-ar-clang-macos' into release-3.21 
Merge-request: !7039
 2022-03-03 12:55:33 -05:00
Brad King 29ea94e17c BinUtils: Avoid llvm-ar on Apple platforms 
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
 2022-03-03 12:54:10 -05:00
Brad King 1f601753d7 gitlab-ci: add jobs testing cuda11.6 with nvcc and clang 13 2022-03-03 12:46:47 -05:00
Brad King 7716750062 ci: add cuda11.6 base image 2022-03-03 12:02:35 -05:00
Brad King 77bdcc949d gitlab-ci: run CUDA and HIP test jobs in any non-MR pipeline 
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.
 2022-03-03 12:02:00 -05:00
Brad King 922791641c Merge branch 'release-3.23' 2022-03-03 11:48:02 -05:00
Brad King 0e27bb9356 Merge topic 'cuda-arch-all' 
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
 2022-03-03 11:48:01 -05:00
Brad King 50b6744c66 Merge topic 'cuda-arch-all' into release-3.23 
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
 2022-03-03 11:48:00 -05:00
Brad King 71323635aa Merge branch 'release-3.23' 2022-03-03 11:46:30 -05:00
Brad King c5ab0ea1fa Merge topic 'cmake-dir-args' 
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
 2022-03-03 11:46:29 -05:00
Brad King 77804f6358 Merge topic 'cmake-dir-args' into release-3.23 
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
 2022-03-03 11:46:28 -05:00
Brad King 8c84b2e468 Merge topic 'ci-continuous' 
bba3d65bb6 ci: add fedora35-ninja build and test jobs in continuous pipeline
e3519aced4 ci: configure rules to enable dependent jbos in continuous pipeline

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7034
 2022-03-03 11:44:39 -05:00
Brad King 5e05e6111e Merge topic 'ci-inplace' 
b88f7aad63 ci: add nightly CI job to build CMake in-place
2a7ac62c04 ci: Compute processor count earlier in ctest_standalone.cmake
1613d87dee ci: Rename ctest_test_external.cmake to ctest_standalone.cmake
ac37e99453 ci: Rename variable CMake_SKIP_INSTALL to CMAKE_CI_NO_INSTALL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7033
 2022-03-03 11:43:59 -05:00
Brad King e5f5e05981 Merge branch 'release-3.23' 2022-03-03 11:42:29 -05:00