Commit Graph

72688 Commits

Author SHA1 Message Date
Craig Scott
2eceae155f GoogleTest: Update policies to CMake 4.2
In fc7aa3cd69 (tests: Preserve empty arguments in test command lines,
2024-09-30), the CMP0174 policy setting had to be explicitly handled in
GoogleTestAddTests.cmake because it was part of the same release.
Now that we're past that release, we can remove that and update the
policies based on the CMake version instead. This removes the TODO
added in that original commit.

We also update the policy settings in GoogleTest.cmake so that we are
using consistent policy settings across the GoogleTest implementation.
2025-10-26 18:10:40 +11:00
Kitware Robot
57a0205c50 CMake Nightly Date Stamp 2025-10-26 00:05:14 -04:00
Brad King
75eb71570f Merge branch 'release-4.2' 2025-10-25 09:18:30 -04:00
Brad King
68f3188b53 Merge branch 'release-4.1' 2025-10-25 09:18:24 -04:00
Brad King
c180135578 Merge branch 'release-4.0' 2025-10-25 09:18:18 -04:00
Brad King
2409ab70a7 Merge branch 'release-3.31' 2025-10-25 09:18:11 -04:00
Brad King
5a7394d3ac Merge branch 'release-4.1' into release-4.2 2025-10-25 09:17:46 -04:00
Brad King
c30e618d44 Merge branch 'release-4.2' 2025-10-25 09:16:07 -04:00
Brad King
badaeac947 Merge topic 'FindPython-3.15'
7f628ea04b FindPython: Add support for Python 3.15
5b78983813 Tests/FindBoost/TestPython: Improve python version list formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Andrej <azhilenkov@gmail.com>
Merge-request: !11350
2025-10-25 09:16:06 -04:00
Brad King
8ba7fc0af9 Merge topic 'FindPython-3.15' into release-4.2
7f628ea04b FindPython: Add support for Python 3.15
5b78983813 Tests/FindBoost/TestPython: Improve python version list formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Andrej <azhilenkov@gmail.com>
Merge-request: !11350
2025-10-25 09:16:05 -04:00
Brad King
197069bc6a Merge branch 'release-4.0' into release-4.1 2025-10-25 09:15:42 -04:00
Brad King
aa8f174479 Merge topic 'FindPython-3.15' into release-4.1
7f628ea04b FindPython: Add support for Python 3.15
5b78983813 Tests/FindBoost/TestPython: Improve python version list formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11350
2025-10-25 09:15:27 -04:00
Brad King
a0e480ca89 Merge branch 'release-3.31' into release-4.0 2025-10-25 09:15:19 -04:00
Brad King
91525f6eb0 Merge topic 'FindPython-3.15' into release-4.0
7f628ea04b FindPython: Add support for Python 3.15
5b78983813 Tests/FindBoost/TestPython: Improve python version list formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11350
2025-10-25 09:15:04 -04:00
Brad King
9d2aa76bb7 Merge topic 'FindPython-3.15' into release-3.31
7f628ea04b FindPython: Add support for Python 3.15
5b78983813 Tests/FindBoost/TestPython: Improve python version list formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11350
2025-10-25 09:14:38 -04:00
Brad King
df83179047 Merge topic 'sbom_model'
0653620033 cmSbom: Add SPDX object model and serializers
985b0f5bcf CMake C++11 Compatibility: Add more type_traits from C++14 and C++17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11231
2025-10-25 09:13:43 -04:00
Brad King
3788b747c4 Merge branch 'release-4.2' 2025-10-25 09:10:54 -04:00
Brad King
9b7d3405a5 Merge topic 'Fix-missing-SWIG_LINK_LIBRARIES-warning'
6eae783add UseSWIG: Issue `swig_link_libraries` deprecation warning if CMP0078 is NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11349
2025-10-25 09:10:53 -04:00
Brad King
0f27d863f6 Merge topic 'Fix-missing-SWIG_LINK_LIBRARIES-warning' into release-4.2
6eae783add UseSWIG: Issue `swig_link_libraries` deprecation warning if CMP0078 is NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11349
2025-10-25 09:10:52 -04:00
Brad King
fb9c243bdc Merge branch 'release-4.2' 2025-10-25 09:02:56 -04:00
Brad King
c305c99ddb Merge topic 'vs-pdb-file-name-path-if-file'
799bf33c5a VS: do not create `ProgramDataBaseFileName` entries without a filepath

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11338
2025-10-25 09:02:55 -04:00
Brad King
c1fcff6bff Merge topic 'vs-pdb-file-name-path-if-file' into release-4.2
799bf33c5a VS: do not create `ProgramDataBaseFileName` entries without a filepath

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11338
2025-10-25 09:02:54 -04:00
Kitware Robot
7d1befd129 CMake Nightly Date Stamp 2025-10-25 00:04:46 -04:00
Karolina Surma
7f628ea04b FindPython: Add support for Python 3.15 2025-10-24 17:42:44 -04:00
Brad King
5b78983813 Tests/FindBoost/TestPython: Improve python version list formatting 2025-10-24 17:42:44 -04:00
Brad King
75ae60b2d6 Merge branch 'release-4.2' 2025-10-24 17:21:21 -04:00
Brad King
046f3dc7b9 Merge topic 'vs-slnx'
46b0202ce0 VS: Fix SLNX generation so CSharp projects build in the IDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11341
2025-10-24 17:21:20 -04:00
Brad King
7708dfe9db Merge topic 'vs-slnx' into release-4.2
46b0202ce0 VS: Fix SLNX generation so CSharp projects build in the IDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11341
2025-10-24 17:21:19 -04:00
Ben Boeckel
799bf33c5a VS: do not create ProgramDataBaseFileName entries without a filepath
The logic in commit f78f592b78 (pchreuse: defer target existence
enforcement to generation time, 2025-06-16, v4.2.0-rc1~481^2~4) caused
generator targets to always respond with something for compilation PDB
files. This may be a directory as the flag supports it (the then
compiler chooses the filename). However, one caller was expecting it to
always be a path to a file in order to specify the
`ProgramDataBaseFileName` element. However, this usage cannot be a
directory.

In addition to not having a PDB path at all, also verify that it is not
a path to a directory before creating the `ProgramDataBaseFileName`
element.

This was observed in builds using `import std` in Debug mode.

Fixes: #27320
2025-10-24 17:18:36 -04:00
Brad King
8b7bf6cc67 Merge topic 'fix/typos-1.38.1'
8de02a14c8 ci(pre-commit): version bump `typos` hook plus fix found typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11344
2025-10-24 17:15:00 -04:00
Brad King
dc347ab3b2 Merge branch 'release-4.2' 2025-10-24 17:13:22 -04:00
Brad King
80cd036ceb Merge topic 'instrumentation-fix-link'
2678028eab Help/instrumentation: Fix link to CMake Content File

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11346
2025-10-24 17:13:22 -04:00
Brad King
5a34759eeb Merge topic 'instrumentation-fix-link' into release-4.2
2678028eab Help/instrumentation: Fix link to CMake Content File

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11346
2025-10-24 17:13:20 -04:00
Brad King
c0fb4675d8 Merge branch 'release-4.2' 2025-10-24 17:11:33 -04:00
Brad King
b15718de08 Merge topic 'cps-use-license'
94b6e36b6b find_package: Respect CPS license

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11343
2025-10-24 17:11:32 -04:00
Brad King
cd28c759ff Merge topic 'cps-use-license' into release-4.2
94b6e36b6b find_package: Respect CPS license

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11343
2025-10-24 17:11:30 -04:00
Brad King
c39b263a91 Merge branch 'release-4.2' 2025-10-24 17:02:26 -04:00
Brad King
f96cb60ba3 Merge topic 'fix-project-license-doc'
6500ea2776 Help: Add missing gate for project(SPDX_LICENSE)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11342
2025-10-24 17:02:26 -04:00
Brad King
4b823eafa3 Merge topic 'fix-project-license-doc' into release-4.2
6500ea2776 Help: Add missing gate for project(SPDX_LICENSE)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11342
2025-10-24 17:02:24 -04:00
Brad King
e970605cdf Merge branch 'release-4.2' 2025-10-24 17:00:07 -04:00
Brad King
d4fa081f78 Merge topic 'FASTBuild-optimize-try_compile'
e42881422f FASTBuild: optimize try_compile builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11335
2025-10-24 17:00:07 -04:00
Brad King
e624610dda Merge topic 'FASTBuild-optimize-try_compile' into release-4.2
e42881422f FASTBuild: optimize try_compile builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11335
2025-10-24 17:00:05 -04:00
Taylor Sasser
0653620033 cmSbom: Add SPDX object model and serializers
Adds definitions for representing software bill of materials (SBOM) information
and generating SPDX SBOMs.

Issue: #26719
Issue: #27001
2025-10-24 13:59:01 -04:00
Andrej730
6eae783add UseSWIG: Issue swig_link_libraries deprecation warning if CMP0078 is NEW 2025-10-24 20:58:23 +05:00
Brad King
46b0202ce0 VS: Fix SLNX generation so CSharp projects build in the IDE
Add an explicit solution-level per-project `Platform` for `.csproj`
projects even if it is the same as the solution-wide `Platform`.
Otherwise the VS IDE skips building it.

Fixes: #27330
2025-10-24 10:18:01 -04:00
Kitware Robot
ae1aa9a8f3 CMake Nightly Date Stamp 2025-10-24 00:05:14 -04:00
Tyler Yankee
2678028eab Help/instrumentation: Fix link to CMake Content File
Fix typo from commit 97adbc91fa (instrumentation: Move target data into
content files, 2025-09-25, v4.2.0-rc1~49^2).
2025-10-23 15:30:09 -04:00
Matthew Woehlke
94b6e36b6b find_package: Respect CPS license
Modify CPS import to set the `SPDX_LICENSE` on imported targets using
the specified package `license`, if present (and if none of the other
mechanisms for setting a license apply).
2025-10-23 14:30:30 -04:00
Alex Turbov
8de02a14c8 ci(pre-commit): version bump typos hook plus fix found typos 2025-10-23 21:14:25 +04:00
Matthew Woehlke
6500ea2776 Help: Add missing gate for project(SPDX_LICENSE)
The `SPDX_LICENSE` option of the `project` command requires that the
`CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO` gate is enabled, but this was
not documented. Add the missing documentation.

Fixes: #27328
2025-10-23 11:36:16 -04:00