Commit Graph

71120 Commits

Author SHA1 Message Date
Brad King 6d30bda5b9 Merge topic 'more-cps-metadata'
755a24ccae CPS: Add export support for [default_]license
fba540daf6 project: Add SPDX_LICENSE argument
f0b419c473 Help: Tweak project DESCRIPTION documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10894
2025-06-26 09:05:52 -04:00
Kitware Robot dcafc85f1d CMake Nightly Date Stamp 2025-06-26 00:05:05 -04:00
Kitware Robot 08e4775016 CMake Nightly Date Stamp 2025-06-25 00:05:13 -04:00
Brad King 171d894996 Merge branch 'release-4.1' 2025-06-24 13:58:39 -04:00
Brad King 7e0e2e6aa2 CMake 4.1.0-rc1 v4.1.0-rc1 2025-06-24 13:23:35 -04:00
Brad King 77eedda812 Merge topic 'commit.gpgsign'
db7c04dfb2 Test(git): set commit.gpgsign to false

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10900
2025-06-24 10:47:14 -04:00
Brad King fa774d734d Merge branch 'release-4.1' 2025-06-24 10:45:34 -04:00
Brad King 1a3dd3ae5b Merge topic 'llvm-binutils'
621d21c827 BinUtils: pick LLVM variants for LLVMFlang and IntelLLVM as well

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10899
2025-06-24 10:45:33 -04:00
Brad King e9ca1d149e Merge topic 'llvm-binutils' into release-4.1
621d21c827 BinUtils: pick LLVM variants for LLVMFlang and IntelLLVM as well

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10899
2025-06-24 10:45:32 -04:00
Brad King 4e562f7c0d Merge branch 'release-4.1' 2025-06-24 10:43:38 -04:00
Brad King aadb7b218e Merge branch 'release-4.0' 2025-06-24 10:43:32 -04:00
Brad King c4415b6b18 Merge branch 'release-4.0' into release-4.1 2025-06-24 10:43:24 -04:00
Brad King 74e86e5f17 Merge branch 'release-4.1' 2025-06-24 10:42:36 -04:00
Brad King be6c582ef6 Merge topic 'normalize-toolchain-file'
c393300e2b cmake: Restore acceptance of -DCMAKE_TOOLCHAIN_FILE=//... on non-Windows
cf0f46ed85 Tests/RunCMake/CommandLine: Simplify --toolchain cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10901
2025-06-24 10:42:36 -04:00
Brad King 9c3ce7852f Merge topic 'normalize-toolchain-file' into release-4.1
c393300e2b cmake: Restore acceptance of -DCMAKE_TOOLCHAIN_FILE=//... on non-Windows
cf0f46ed85 Tests/RunCMake/CommandLine: Simplify --toolchain cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10901
2025-06-24 10:42:34 -04:00
Brad King 872d808ed4 Merge topic 'normalize-toolchain-file' into release-4.0
c393300e2b cmake: Restore acceptance of -DCMAKE_TOOLCHAIN_FILE=//... on non-Windows
cf0f46ed85 Tests/RunCMake/CommandLine: Simplify --toolchain cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10901
2025-06-24 10:41:01 -04:00
Kitware Robot 0784278739 CMake Nightly Date Stamp 2025-06-24 00:04:39 -04:00
Brad King c393300e2b cmake: Restore acceptance of -DCMAKE_TOOLCHAIN_FILE=//... on non-Windows
POSIX specifies that two leading slashes have implementation-defined
interpretation, so CMake 3.31 and below did not normalize away leading
double slashes.  However, most implementations simply treat a leading
`//` as just `/`, so CMake 4.0 now normalizes them away when they do not
correspond to a network path on Windows.

This change exposed that we were not normalizing `CMAKE_TOOLCHAIN_FILE`
before passing its value to `include()` the first time if it was not
passed with the `FILEPATH` or `PATH` cache entry type.  Fix that.

Fixes: #27010
2025-06-23 10:37:59 -04:00
Brad King cf0f46ed85 Tests/RunCMake/CommandLine: Simplify --toolchain cases 2025-06-23 10:23:11 -04:00
Eisuke Kawashima 621d21c827 BinUtils: pick LLVM variants for LLVMFlang and IntelLLVM as well
Fixes: #26196
2025-06-23 09:39:54 -04:00
Brad King ef28128d4b Merge topic 'cps-read-default-license'
1d4fb4afa9 find_package: Respect CPS default_license

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10897
2025-06-23 09:37:30 -04:00
Brad King 114dae7389 Merge branch 'release-4.1' 2025-06-23 09:36:38 -04:00
Brad King 6a0c2f0050 Merge topic 'fix-typo-found-by-sphinx-lint'
45b374234a Help: fix typo found by the `sphinx-lint` plugin of `pre-commit`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10896
2025-06-23 09:36:37 -04:00
Brad King c8cc5637b2 Merge topic 'fix-typo-found-by-sphinx-lint' into release-4.1
45b374234a Help: fix typo found by the `sphinx-lint` plugin of `pre-commit`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10896
2025-06-23 09:36:36 -04:00
Brad King 2a4a33ee7a Merge topic 'spdx-serializer'
be4a942d7f SBOM(SPDX): Implement graph components and serializer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mathieu Westphal (Kitware) <mathieu.westphal@kitware.com>
Merge-request: !10892
2025-06-23 09:35:40 -04:00
Kitware Robot 0710a99c95 CMake Nightly Date Stamp 2025-06-23 00:04:33 -04:00
Kitware Robot 2cca429fa0 CMake Nightly Date Stamp 2025-06-22 00:06:15 -04:00
Eisuke Kawashima db7c04dfb2 Test(git): set commit.gpgsign to false
If a user has run `git config --global commit.gpgsign true`,
git-related tests fail since the test users do not exist and gpg cannot
sign.
2025-06-22 01:45:19 +09:00
Kitware Robot 076c4d01ae CMake Nightly Date Stamp 2025-06-21 00:04:16 -04:00
Alex Turbov 45b374234a Help: fix typo found by the sphinx-lint plugin of pre-commit 2025-06-20 14:26:39 -04:00
Matthew Woehlke 755a24ccae CPS: Add export support for [default_]license
Add `LICENSE` and `DEFAULT_LICENSE` arguments to the `PACKAGE_INFO`
modes of the `install` and `export` commands. If not otherwise
specified, the `LICENSE` will be taken from the project's
`SPDX_LICENSE`, if available.
2025-06-20 14:01:25 -04:00
Matthew Woehlke fba540daf6 project: Add SPDX_LICENSE argument
Add an argument to the `project` command to allow specifying a license
for a project as a whole. This is in addition to specifying licenses on
individual targets, and will be used to set the license(s) on exported
packages.

Also, move listing of `COMPAT_VERSION` variables to follow
lexicographical order.
2025-06-20 14:01:25 -04:00
Matthew Woehlke f0b419c473 Help: Tweak project DESCRIPTION documentation
Replace the 'project-description-string' descriptor in the `project`,
`export` and `install` commands with 'description-string'. This is more
consistent, as none of the other descriptors include 'project-', and
it's arguably wrong in the context of `export`/`install`, as the
description applies to a package.
2025-06-20 14:01:25 -04:00
Brad King f19c3b8be6 Merge topic 'COMPILER_LINKER-GenEx'
60fb5a5792 GenEx: add expressions related to linker

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10888
2025-06-20 13:48:17 -04:00
Brad King bf2ca321fa Merge branch 'release-4.1' 2025-06-20 13:47:13 -04:00
Brad King 4fd8f96c26 Merge topic 'improve-project-doc'
1cd8c8f02a Help: Mention use of project() variables in packages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10895
2025-06-20 13:47:12 -04:00
Brad King 2720b0b95b Merge topic 'improve-project-doc' into release-4.1
1cd8c8f02a Help: Mention use of project() variables in packages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10895
2025-06-20 13:47:11 -04:00
Kitware Robot 17bc81be67 CMake Nightly Date Stamp 2025-06-20 00:08:03 -04:00
Matthew Woehlke 1d4fb4afa9 find_package: Respect CPS default_license
Modify CPS import to set the `SPDX_LICENSE` on imported targets using
the specified `default_license`, if present (and if no per-component
`license` is specified).
2025-06-19 13:52:13 -04:00
Vito Gamberini be4a942d7f SBOM(SPDX): Implement graph components and serializer 2025-06-19 10:44:27 -04:00
Matthew Woehlke 1cd8c8f02a Help: Mention use of project() variables in packages
The `project` command mentions that it sets variables "intended for use
as default values in package metadata". Add a sentence that the
`install` and `export` commands actually do so for CPS. Also add
`COMPAT_VERSION` to the list of relevant options.
2025-06-19 10:34:46 -04:00
Brad King 48d382fd17 Merge topic 'find_package-deterministic-order'
61d8fae116 find_package: Use deterministic search order by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10882
2025-06-19 10:30:44 -04:00
Brad King c61d4d48a6 Merge topic 'emscripten-platform'
d89f1cbc16 ci: Enable Emscripten test on some Debian jobs in nightly pipeline
33082bf817 ci: add scripts to install Emscripten 4.0.9
c6da668b13 Emscripten: Add tests for the Emscripten toolchain
96d9b94a98 Emscripten: Add platform modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10832
2025-06-19 10:22:15 -04:00
Brad King 10538276f3 Merge branch 'release-4.1' 2025-06-19 10:20:48 -04:00
Brad King 6e5890f873 Merge topic 'vs-link-defaults'
99d09ec45a VS: Suppress MSBuild default link flags not specified by project or user

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10891
2025-06-19 10:20:48 -04:00
Brad King 5dd4af194e Merge topic 'vs-link-defaults' into release-4.1
99d09ec45a VS: Suppress MSBuild default link flags not specified by project or user

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10891
2025-06-19 10:20:47 -04:00
Brad King 5470b002fb Merge branch 'release-4.1' 2025-06-19 10:19:29 -04:00
Brad King 739d188703 Merge topic 'openssl-arm64-windows'
bf52219e4c FindOpenSSL: Add support for ARM64 Windows pre-built binaries
5afebd310e FindOpenSSL: Refactor architecture-specific suffix table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10893
2025-06-19 10:19:28 -04:00
Brad King b8cbc0b2bb Merge topic 'openssl-arm64-windows' into release-4.1
bf52219e4c FindOpenSSL: Add support for ARM64 Windows pre-built binaries
5afebd310e FindOpenSSL: Refactor architecture-specific suffix table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10893
2025-06-19 10:19:27 -04:00
Marc Chevrier 60fb5a5792 GenEx: add expressions related to linker
Introduce the following genex:
* <LANG>_COMPILER_LINKER_ID
* <LANG>_COMPILER_LINKER_FRONTEND_VARIANT

Fixes: #26991
2025-06-19 16:11:17 +02:00