Brad King
1456d0c0f9
Merge branch 'release-4.0'
2025-02-21 09:06:48 -05:00
Brad King
4701678fa1
Merge topic 'doc-add_dependencies'
...
77a742b088
Help: add_dependencies requires at least two arguments
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10370
2025-02-21 09:06:48 -05:00
Brad King
7886374d2b
Merge topic 'doc-add_dependencies' into release-4.0
...
77a742b088
Help: add_dependencies requires at least two arguments
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10370
2025-02-21 09:06:46 -05:00
Brad King
9a5d968484
Merge branch 'release-4.0'
2025-02-21 09:04:52 -05:00
Brad King
cbfe6947e6
Merge topic 'rel-src-cleanup'
...
57a24181ed
clang-tidy: Do not require config file if not running clang-tidy
aa42ba1ac8
gitattributes: Do not export pre-commit config file in source archives
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10371
2025-02-21 09:04:52 -05:00
Brad King
a96a80ca09
Merge topic 'rel-src-cleanup' into release-4.0
...
57a24181ed
clang-tidy: Do not require config file if not running clang-tidy
aa42ba1ac8
gitattributes: Do not export pre-commit config file in source archives
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10371
2025-02-21 09:04:50 -05:00
Kitware Robot
d89c4cd3fb
CMake Nightly Date Stamp
2025-02-21 00:06:46 -05:00
Brad King
af65a5d98b
Merge branch 'upstream-jsoncpp' into update-jsoncpp
...
* upstream-jsoncpp:
jsoncpp 2024-09-09 (89e2973c)
2025-02-20 19:07:15 -05:00
JsonCpp Upstream
6a4aca62f6
jsoncpp 2024-09-09 (89e2973c)
...
Code extracted from:
https://github.com/open-source-parsers/jsoncpp.git
at commit 89e2973c754a9c02a49974d839779b151e95afd6 (1.9.6).
2025-02-20 19:04:48 -05:00
Brad King
3dec83ae8c
jsoncpp: Update script to get jsoncpp 1.9.6
2025-02-20 19:04:28 -05:00
Brad King
626d466b12
Tests: Make RunCMake.ParseImplicitLinkInfo robust to on-disk libstdc++.a
...
Extend commit 1d7fddca8e
(CMakeParseImplicitLinkInfo: Honor GNU static
runtime library flags, 2021-06-02, v3.21.0-rc1~85^2) to cover Cray 8.7
sample data.
2025-02-20 18:50:34 -05:00
Brad King
bf2067d67b
Tests: Fix typos in RunCMake.ParseImplicitLinkInfo sample data
2025-02-20 18:50:16 -05:00
Osyotr
b69d64f72b
FindwxWidgets: special case -latomic
...
Fixes : #26718
2025-02-20 17:23:25 -05:00
Brad King
33856b1d62
Add CMAKE_POLICY_VERSION_MINIMUM environment variable
...
Extend commit 1a35351125
(Add CMAKE_POLICY_VERSION_MINIMUM to help
configure outdated projects, 2025-02-13, v4.0.0-rc1~12^2) with an
environment variable to initialize the cache entry. That will make it
easier to use when `cmake` is invoked under layers of scripting.
Closes : #26715
2025-02-20 16:55:53 -05:00
Brad King
04721acc6c
Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in initial cache script
2025-02-20 16:27:05 -05:00
Brad King
729470ff6d
Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in script mode
2025-02-20 15:59:03 -05:00
Brad King
6cd10ffed7
Tests: Cover CMAKE_POLICY_VERSION_MINIMUM as cache entry
2025-02-20 15:48:00 -05:00
Matthew Woehlke
da0d2a996d
CPS: Fix importing from the prefix root
...
Tweak resolution of CPS prefix path to support the case of the .cps file
being in the prefix root.
2025-02-20 14:49:53 -05:00
Brad King
d3484a31c6
Merge topic 'help-vs-properties'
...
9955a3bb73
Help: Clarify EXCLUDE_FROM_DEFAULT_BUILD behavior
8fa9858e20
Help: Improve VS_SETTINGS and VS_TOOL_OVERRIDE documentation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10367
2025-02-20 10:29:52 -05:00
Brad King
00a92521d0
Merge topic 'FindOpenCL-multiple-versions'
...
520eb40e69
FindOpenCL: Fix version detection in presence of multiple versions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10366
2025-02-20 10:28:53 -05:00
Brad King
5585b2521e
Merge topic 'compile-commands-posix-paths'
...
971a8ded06
EXPORT_COMPILE_COMMANDS: Write absolute posix paths to compile_commands.json
ff119423b9
EXPORT_COMPILE_COMMANDS: Append missing newline to compile_commands.json
92fb080ed6
Tests/RunCMake/Swift: Fix CompileCommands expected regex
7d8b39226c
cmGlobalNinjaGenerator: Remove obsolete TODO comment
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !10357
2025-02-20 10:27:24 -05:00
Brad King
57a24181ed
clang-tidy: Do not require config file if not running clang-tidy
...
Since commit 00cfea965b
(gitattributes: Do not export lint config files
in source archives, 2025-01-24, v4.0.0-rc1~129^2) the `.clang-tidy`
config file is not available in source archives. Require it only when
the `CMake_RUN_CLANG_TIDY` option is turned on, which we only do in
development and CI builds.
Fixes : #26712
2025-02-20 09:07:50 -05:00
Brad King
aa42ba1ac8
gitattributes: Do not export pre-commit config file in source archives
...
Exclude the file added by commit de59765336
(pre-commit: Add an initial
configuration file, 2025-01-04, v4.0.0-rc1~118^2~11).
2025-02-20 09:03:42 -05:00
Brad King
77a742b088
Help: add_dependencies requires at least two arguments
...
Update the documentation to match the implementation.
2025-02-20 08:25:58 -05:00
Nikita Nemkin
33e85acff7
CPack/NSIS: Use the installed display name in uninstall prompt
...
When a new installation prompts to uninstall the old version,
use the display name of the old version from the registry.
This only affects packages that change their CPACK_NSIS_DISPLAY_NAME.
Patch-by: David Golub <golubdr@gmail.com>
Fixes : #14112
2025-02-20 13:12:11 +05:00
Kitware Robot
ebe181646e
CMake Nightly Date Stamp
2025-02-20 00:07:53 -05:00
Nikita Nemkin
9955a3bb73
Help: Clarify EXCLUDE_FROM_DEFAULT_BUILD behavior
...
Note that solution build configurations ignore dependencies, unlike
the ALL_BUILD target.
Fixes : #12379
2025-02-19 21:07:51 +05:00
Nikita Nemkin
8fa9858e20
Help: Improve VS_SETTINGS and VS_TOOL_OVERRIDE documentation
...
Reorder paragraphs, adjust version notes, add cross-references,
note the ability to exclude files from the build.
Fixes : #11902
2025-02-19 21:07:03 +05:00
Brad King
628423fbc1
Merge branch 'release-4.0'
2025-02-19 09:55:56 -05:00
Brad King
4b5b172a65
CMake 4.0.0-rc1
2025-02-19 09:18:19 -05:00
redradist
520eb40e69
FindOpenCL: Fix version detection in presence of multiple versions
...
Previously our call to `check_symbol_exists` was passing an absolute
path to the `cl.h` header to be included. However, this might not
include its other headers correctly. We already set
`CMAKE_REQUIRED_INCLUDES` such that `CL/cl.h` can be included by
the check, so we do not need to include by absolute path.
2025-02-19 08:58:34 -05:00
Kitware Robot
110b217c14
CMake Nightly Date Stamp
2025-02-19 00:06:06 -05:00
ClausKlein
971a8ded06
EXPORT_COMPILE_COMMANDS: Write absolute posix paths to compile_commands.json
...
Avoid platform-specific path formats in structured fields.
2025-02-18 16:03:15 -05:00
ClausKlein
ff119423b9
EXPORT_COMPILE_COMMANDS: Append missing newline to compile_commands.json
2025-02-18 16:01:24 -05:00
Brad King
92fb080ed6
Tests/RunCMake/Swift: Fix CompileCommands expected regex
...
Previously missing `()` were allowing `|` to match only partial results.
2025-02-18 15:59:36 -05:00
ClausKlein
7d8b39226c
cmGlobalNinjaGenerator: Remove obsolete TODO comment
2025-02-18 11:25:14 -05:00
Brad King
d2cda92936
Merge topic 'remove-FindGCCXML'
...
2123244746
FindGCCXML: Add policy to remove this module
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10359
2025-02-18 09:51:32 -05:00
Brad King
38cad1280d
Merge branch 'release-4.0'
2025-02-18 09:49:47 -05:00
Brad King
121b1f717a
Merge topic 'instrumentation-presets-hooks'
...
45d3ffaa95
instrumentation: Use auto for variables holding closures
d75ccd9f8d
instrumentation: Fix docs for ctest --collect-instrumentation option
a2232db802
instrumentation: Make hooks compatible with presets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10352
2025-02-18 09:49:47 -05:00
Brad King
ccfa403859
Merge topic 'instrumentation-presets-hooks' into release-4.0
...
45d3ffaa95
instrumentation: Use auto for variables holding closures
d75ccd9f8d
instrumentation: Fix docs for ctest --collect-instrumentation option
a2232db802
instrumentation: Make hooks compatible with presets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10352
2025-02-18 09:49:44 -05:00
Brad King
13352d005b
Merge branch 'release-4.0'
2025-02-18 09:43:24 -05:00
Brad King
00ee82c190
Merge topic 'policy_max-docs'
...
48095c623f
Help/cmake_minimum_required: clarify policy_max `versionadded` note
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10363
2025-02-18 09:43:24 -05:00
Brad King
d40e1a0682
Merge topic 'policy_max-docs' into release-4.0
...
48095c623f
Help/cmake_minimum_required: clarify policy_max `versionadded` note
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10363
2025-02-18 09:43:23 -05:00
Brad King
200921a406
Merge branch 'release-4.0'
2025-02-18 09:37:02 -05:00
Brad King
63a07d455b
Merge topic 'doc-4.0-relnotes-typo'
...
b5374e0405
Help: Fix typo in 4.0 release notes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10358
2025-02-18 09:37:02 -05:00
Brad King
4c2bdf177d
Merge topic 'doc-4.0-relnotes-typo' into release-4.0
...
b5374e0405
Help: Fix typo in 4.0 release notes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10358
2025-02-18 09:37:00 -05:00
Ben Boeckel
48095c623f
Help/cmake_minimum_required: clarify policy_max versionadded
note
...
While the prose clarifies this below, a quick glance at the docs can
make one believe that `...3.10` has no sensible use. However, it is
still useful to tell CMake 3.12 and up that at least 3.10 behavior is
accepted.
2025-02-18 06:20:32 +01:00
Kitware Robot
f643ca3c57
CMake Nightly Date Stamp
2025-02-18 00:11:27 -05:00
Brad King
2123244746
FindGCCXML: Add policy to remove this module
...
GCC-XML has been superseded by CastXML for a long time.
Closes : #26687
2025-02-17 11:35:25 -05:00
Martin Duffy
45d3ffaa95
instrumentation: Use auto for variables holding closures
2025-02-17 11:08:30 -05:00