Commit Graph

69587 Commits

Author SHA1 Message Date
Peter Kokot
be9011c275 CTestUseLaunchers: Update documentation 2025-03-05 22:03:19 +01:00
Brad King
7065c7a586 Merge branch 'release-4.0' 2025-03-05 09:38:56 -05:00
Brad King
bc51d06814 CMake 4.0.0-rc3 v4.0.0-rc3 2025-03-05 09:08:59 -05:00
Brad King
14b934b48e Merge branch 'release-4.0' 2025-03-05 09:08:14 -05:00
Brad King
fce3d54740 Merge topic 'license-rst'
cbc54536b7 ci: Forward our dedicated license file to CPack packaging steps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10426
2025-03-05 09:08:14 -05:00
Brad King
48b437418b Merge topic 'license-rst' into release-4.0
cbc54536b7 ci: Forward our dedicated license file to CPack packaging steps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10426
2025-03-05 09:08:12 -05:00
Brad King
cbc54536b7 ci: Forward our dedicated license file to CPack packaging steps
This was missed in commit a9190bd38d (CMake: Prepare dedicated license
file for our own CPack configuration, 2025-03-02).
2025-03-05 09:01:37 -05:00
Brad King
3524abf345 Merge topic 'build-database-fixes'
12d73c9f78 cmExperimental: recycle build database uuid
d02ca76184 cmDyndepCollation: record required modules to the build database
8a773168fd Tests/CXXModules: help diagnose build database errors
7ca4ac8e13 cmBuildDatabase: fix language comparison for visibility

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10414
2025-03-05 08:32:50 -05:00
Brad King
ba3ad7c9e3 Merge topic 'ninja-acc-target-comments'
0122e02293 Ninja: Add COMMENT to custom command and target descriptions
30fb5b1b22 Ninja: add COMMENT to build statement descriptions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9484
2025-03-05 08:31:31 -05:00
Brad King
8295a4ad32 Merge topic 'cuda-cross-targets'
781a67bf5e CUDA/Clang: Determine cross-compiling target from CMAKE_CUDA_COMPILER_TARGET
40eeca77c3 CUDA/Clang: Sync target directory table with FindCUDAToolkit
05efcdd464 FindCUDA: Sync target directory table with FindCUDAToolkit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10421
2025-03-05 08:27:23 -05:00
Brad King
2a63964b73 Merge topic 'typos-1.30.0'
d168cd397f pre-commit: version bump `typos` hook to 1.30 + add some more ignore IDs
4d99e2b702 Help(FindJasper): Fix the spelling typo in the variable documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10417
2025-03-05 08:26:14 -05:00
Brad King
e9ea2b8212 Merge branch 'release-4.0' 2025-03-05 08:22:28 -05:00
Brad King
2586a2ce82 Merge topic 'ninja-many-subdirs'
5a36d0c9e7 Ninja: Fix regression with a large number of subdirectories
a30cf4a66a Tests/RunCMake/Configure: Split ninja-specific RerunCMake case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10420
2025-03-05 08:22:27 -05:00
Brad King
6017ac8f38 Merge topic 'ninja-many-subdirs' into release-4.0
5a36d0c9e7 Ninja: Fix regression with a large number of subdirectories
a30cf4a66a Tests/RunCMake/Configure: Split ninja-specific RerunCMake case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10420
2025-03-05 08:22:25 -05:00
Brad King
93abad5173 Merge branch 'release-4.0' 2025-03-05 08:20:54 -05:00
Brad King
5b51e43e9d Merge topic 'license-rst'
00b6a4b592 bootstrap: Update copyright line extraction for reST markup in LICENSE.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10425
2025-03-05 08:20:54 -05:00
Brad King
581182e8f5 Merge topic 'license-rst' into release-4.0
00b6a4b592 bootstrap: Update copyright line extraction for reST markup in LICENSE.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10425
2025-03-05 08:20:52 -05:00
Brad King
00b6a4b592 bootstrap: Update copyright line extraction for reST markup in LICENSE.rst
Since commit 8d83487e60 (CONTRIBUTORS: Factor contributors list out of
license file, 2025-03-02) the copyright line has reStructuredText
markup.  Filter it out of the copyright line printed by `bootstrap`.
2025-03-05 06:48:39 -05:00
Kitware Robot
c75a912227 CMake Nightly Date Stamp 2025-03-05 00:05:52 -05:00
Brad King
781a67bf5e CUDA/Clang: Determine cross-compiling target from CMAKE_CUDA_COMPILER_TARGET
When cross-compiling CUDA with Clang, `CMAKE_CUDA_COMPILER_TARGET` is
typically set to the target triple.  Use it to select the CUDA toolkit
target directory.
2025-03-04 13:51:29 -05:00
Brad King
40eeca77c3 CUDA/Clang: Sync target directory table with FindCUDAToolkit
Since commit 6636693134 (FindCUDAToolkit: Re-unify with
Internal/CUDAToolkit, 2020-06-11, v3.18.0-rc2~6^2~7) the table is
duplicated.

Update the CUDA target directory table for Clang to account for changes
to the equivalent table in FindCUDAToolkit:

* commit bcdd486bf7 (CUDA: Enable support on QNX, 2020-10-30,
                     v3.19.0-rc3~8^2~1)
* commit 743d4181b4 (FindCUDAToolkit: Support cross-compilation to
                     sbsa-linux, 2023-01-11, v3.26.0-rc1~118^2)
2025-03-04 13:51:29 -05:00
Brad King
05efcdd464 FindCUDA: Sync target directory table with FindCUDAToolkit
The table has been duplicated since commit 69fcad9332 (CUDAToolkit: Add
support for cross-compiling, 2020-01-21, v3.17.0-rc1~104^2~1).
2025-03-04 13:51:29 -05:00
Ben Boeckel
5a36d0c9e7 Ninja: Fix regression with a large number of subdirectories
Since commit f50fb77a4f (Ninja: Regenerate when test or install scripts
are missing, 2024-10-29, v4.0.0-rc1~516^2) the list of paths we pass to
`ninja -t restat` scales with the number of project subdirectories.
Run it in blocks to avoid "command line too long" errors, particularly
on Windows.

Fixes: #26738
2025-03-04 13:37:01 -05:00
Brad King
a30cf4a66a Tests/RunCMake/Configure: Split ninja-specific RerunCMake case
Split the test case from commit f50fb77a4f (Ninja: Regenerate when test
or install scripts are missing, 2024-10-29, v4.0.0-rc1~516^2) into a
dedicated case.
2025-03-04 17:46:31 +01:00
Brad King
7e2f2c9bfb Merge branch 'release-4.0' 2025-03-04 09:40:43 -05:00
Brad King
7177e58d64 Merge topic 'license-rst'
a9bcf09edd CONTRIBUTORS: Update per-contributor hyperlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10419
2025-03-04 09:40:43 -05:00
Brad King
fb8872653c Merge topic 'license-rst' into release-4.0
a9bcf09edd CONTRIBUTORS: Update per-contributor hyperlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10419
2025-03-04 09:40:41 -05:00
Brad King
a9bcf09edd CONTRIBUTORS: Update per-contributor hyperlinks
In commit 2f852580fb (CONTRIBUTORS: Improve formatting of
per-contributor hyperlinks, 2025-03-02) we accidentally added `mailto:`
on a few URLs that should use `https://` instead.

Reported-by: Rolf Eike Beer <eb@emlix.com>
2025-03-04 08:57:03 -05:00
Brad King
213ea8a752 Merge topic 'patch-ProcessorCount'
9e40bd860f ProcessorCount: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10407
2025-03-04 08:48:22 -05:00
Brad King
0af6821799 Merge topic 'cpack-rpm-weak-deps-tags'
14baa13ab8 CPack/RPM: Add support for all weak dependency tags
847f515934 Tests: Simplify RunCMake.CPack_RPM.SUGGESTS expected output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10415
2025-03-04 08:47:25 -05:00
Brad King
e5b4cbb22f Merge branch 'release-4.0' 2025-03-04 08:45:07 -05:00
Brad King
f8b284cb3e Merge topic 'fix-cps-component-documentation'
b8d4c58e6c Merge branch 'backport-fix-cps-component-documentation' into fix-cps-component-documentation
76e11bd4ea Help: Fix find_package documentation about CPS and COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10405
2025-03-04 08:45:07 -05:00
Brad King
455f2249bc Merge topic 'fix-cps-component-documentation' into release-4.0
76e11bd4ea Help: Fix find_package documentation about CPS and COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10405
2025-03-04 08:45:06 -05:00
Brad King
168329857d Merge branch 'release-4.0' 2025-03-04 08:38:11 -05:00
Brad King
bf8f4d4639 Merge topic 'license-rst'
e2f03680b3 Merge branch 'backport-license-rst' into license-rst
e89ca6e4df Merge branch 'backport-license-rst' (early part) into license-rst
1772622772 LICENSE: Replace references to Copyright.txt with LICENSE.rst
67b6964efa Merge branch 'backport-license-rst' (early part) into license-rst
2f852580fb CONTRIBUTORS: Improve formatting of per-contributor hyperlinks
8d83487e60 CONTRIBUTORS: Factor contributors list out of license file
1fd8a2be4d LICENSE: Clarify role of copyright in contributions
de273b2e11 LICENSE: Replace references to Copyright.txt with LICENSE.rst
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !10416
2025-03-04 08:38:11 -05:00
Brad King
2dac61ce26 Merge topic 'license-rst' into release-4.0
2f852580fb CONTRIBUTORS: Improve formatting of per-contributor hyperlinks
8d83487e60 CONTRIBUTORS: Factor contributors list out of license file
1fd8a2be4d LICENSE: Clarify role of copyright in contributions
de273b2e11 LICENSE: Replace references to Copyright.txt with LICENSE.rst
2d42a5444f LICENSE: Rename Copyright.txt to LICENSE.rst
5317564894 Copyright.txt: Add contributor section headers
834c9236e4 Copyright.txt: Remove excess indentation
afeca383d6 Copyright.txt: Drop outdated content around copyright notice line
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !10416
2025-03-04 08:38:09 -05:00
Kitware Robot
f855d79913 CMake Nightly Date Stamp 2025-03-04 00:07:16 -05:00
Alex Turbov
d168cd397f pre-commit: version bump typos hook to 1.30 + add some more ignore IDs 2025-03-04 04:28:07 +04:00
Alex Turbov
4d99e2b702 Help(FindJasper): Fix the spelling typo in the variable documentation 2025-03-04 04:25:36 +04:00
Ben Boeckel
12d73c9f78 cmExperimental: recycle build database uuid 2025-03-03 22:03:27 +01:00
Ben Boeckel
d02ca76184 cmDyndepCollation: record required modules to the build database 2025-03-03 22:03:27 +01:00
Ben Boeckel
8a773168fd Tests/CXXModules: help diagnose build database errors
In tests that compare multiple files, knowing which file(s) errors come
from is difficult. Log the actual filepaths when this occurs to help
debugging.
2025-03-03 22:02:40 +01:00
Ben Boeckel
7ca4ac8e13 cmBuildDatabase: fix language comparison for visibility
Only C++ sources need checked for `CXX_MODULES` file set types, not the
other way around.
2025-03-03 22:00:23 +01:00
Ben Boeckel
0122e02293 Ninja: Add COMMENT to custom command and target descriptions
Fixes: #15461
2025-03-03 11:58:21 -05:00
Ben Boeckel
30fb5b1b22 Ninja: add COMMENT to build statement descriptions
This allows users to recognize that something more than the basic action
is happening.

See: https://groups.google.com/g/ninja-build/c/Tv4wu2IBMdo
Issue: #15461
2025-03-03 11:58:13 -05:00
Matthew Woehlke
b8d4c58e6c Merge branch 'backport-fix-cps-component-documentation' into fix-cps-component-documentation
* backport-fix-cps-component-documentation:
  Help: Fix find_package documentation about CPS and COMPONENTS
2025-03-03 11:49:46 -05:00
Brad King
e2f03680b3 Merge branch 'backport-license-rst' into license-rst 2025-03-03 10:43:55 -05:00
Brad King
e89ca6e4df Merge branch 'backport-license-rst' (early part) into license-rst 2025-03-03 10:43:49 -05:00
Kitware Robot
1772622772 LICENSE: Replace references to Copyright.txt with LICENSE.rst
```
git grep -lz 'Copyright.txt or https://cmake.org/licensing ' |
  while IFS= read -r -d $'\0' f ; do
    sed -i '/Copyright.txt or https:\/\/cmake.org\/licensing / {
              s/Copyright.txt/LICENSE.rst/
            }' "$f" ; done
```
2025-03-03 10:43:35 -05:00
Brad King
67b6964efa Merge branch 'backport-license-rst' (early part) into license-rst 2025-03-03 10:42:50 -05:00