Commit Graph

73308 Commits

Author SHA1 Message Date
Brad King
d6b76cdc87 Merge topic 'cps-validate-version'
cc508826b4 CPS: Validate package version
fb66a14da2 cmExportFileGenerator: Allow other message types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11458
2025-12-02 15:43:42 -05:00
Brad King
866dd25916 Merge topic 'Linux-IntelLLVM'
0837fb552f IntelLLVM: Remove unused code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11468
2025-12-02 15:39:48 -05:00
Brad King
17c74f6719 Merge topic 'bundled'
82e3d17b5e Utilities: Announce both system-installed and bundled dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11427
2025-12-02 15:38:26 -05:00
Brad King
95e8df9cab Merge topic 'fix-docs-27429'
cd5f7eb30a Help: improve XZ compression method docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11463
2025-12-02 15:37:22 -05:00
Brad King
979ca75993 Merge branch 'release-4.2' 2025-12-02 15:32:01 -05:00
Brad King
7a7028eb48 Merge topic 'improve-subcommand-message-consistency'
a1a75f4008 cmake_file_api: Improve error message consistency
61143d7cef export: Improve error message consistency

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11470
2025-12-02 15:32:01 -05:00
Brad King
e12206b738 Merge topic 'improve-subcommand-message-consistency' into release-4.2
a1a75f4008 cmake_file_api: Improve error message consistency
61143d7cef export: Improve error message consistency

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11470
2025-12-02 15:31:59 -05:00
Brad King
23297c6140 Merge branch 'release-4.2' 2025-12-02 15:20:14 -05:00
Brad King
a294c9ac1a Merge topic 'fix-cps-arg-parsing'
41b6b07527 cmExportCommand: Fix PACKAGE_INFO argument parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11459
2025-12-02 15:20:14 -05:00
Brad King
dd96576e15 Merge topic 'fix-cps-arg-parsing' into release-4.2
41b6b07527 cmExportCommand: Fix PACKAGE_INFO argument parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11459
2025-12-02 15:20:12 -05:00
Kitware Robot
b65b7687cc CMake Nightly Date Stamp 2025-12-02 00:08:11 -05:00
Eisuke Kawashima
0837fb552f IntelLLVM: Remove unused code
In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based
compilers, 2020-11-02, v3.20.0-rc1~89^2~20) we added a `set()` that is
immediately followed by another `set()` of the same variable.  Remove
the former.

Fixes: #27019
2025-12-01 16:26:58 -05:00
Matthew Woehlke
a1a75f4008 cmake_file_api: Improve error message consistency
Remove literal text "subcommand" from error messages. This addresses the
other use of this and improves consistency (see preceding commit). Also,
omit some unnecessary articles, which also improves consistency.
2025-12-01 15:52:36 -05:00
Matthew Woehlke
61143d7cef export: Improve error message consistency
Remove literal text "subcommand" from error messages. Most other
commands report errors like "<command> <subcommand> <message>", where
the message does not include the literal text "subcommand". The `export`
command was one of two exceptions to this.
2025-12-01 15:41:18 -05:00
Ross Burton
82e3d17b5e Utilities: Announce both system-installed and bundled dependencies
CMake already says if it's using a system-installed component when
configuring:

    -- Using system-installed BZIP2

For clarity, also list what components are using the bundled source
code.  Example output:

    -- Using system installed: ZLIB
    -- Using bundled: BZIP2 CPPDAP CURL EXPAT FORM JSONCPP LIBARCHIVE
       LIBLZMA LIBRHASH LIBUV NGHTTP2 ZSTD KWIML

This is useful when verifying packaging of CMake itself.
2025-12-01 15:03:04 -05:00
Brad King
44458b5f51 Merge branch 'release-4.2' 2025-12-01 14:01:11 -05:00
Brad King
507c3331a9 Merge branch 'release-4.1' 2025-12-01 14:01:03 -05:00
Brad King
91d7d19a89 Merge branch 'release-4.1' into release-4.2 2025-12-01 14:00:50 -05:00
Brad King
121234b968 Merge topic 'fix-cps-export-definitions' into release-4.1
b2ca9fba8b CPS: Fix exporting definitions in CMake 4.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11469
2025-12-01 13:59:36 -05:00
Brad King
0c058a7b8f Merge topic 'source-groups-lookup-perf'
a46491d0d3 cmLocalGenerator: Improve performance of source group lookups
caf6e782e1 cmSourceGroup: Move FindSourceGroup out of cmMakefile
de2afc5d53 cmMakeFile: Remove source groups argument from `FindSourceGroup`
1dcebce19f cmSourceGroup: Fix typos and improve methods const correctness
0ff69e0da2 VS: remove unused argument from `WriteProjectStart`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11409
2025-12-01 12:37:54 -05:00
Brad King
ccad6e8bdb Merge topic 'interface-libraries-duplicate-deps'
725ea968ac De-duplicate dependencies propagated through interface libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11440
2025-12-01 12:36:48 -05:00
Brad King
0b6492faf3 Merge topic 'bump-pre-commit-hooks-plus-fixes'
472a04ab9e ci(pre-commit): bump pre-commit hooks + fixes of found typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11454
2025-12-01 12:35:10 -05:00
Brad King
b8316b51f9 Merge topic 'doc-qnx'
50b53d1952 Help: Fix QNX cross-compile example toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11456
2025-12-01 12:33:18 -05:00
Brad King
6f176ae0f5 Merge branch 'release-4.2' 2025-12-01 12:31:02 -05:00
Brad King
84a2cbbbcd Merge branch 'release-4.1' 2025-12-01 12:30:52 -05:00
Brad King
46e60dbc90 Merge branch 'release-4.1' into release-4.2 2025-12-01 12:30:40 -05:00
Brad King
30bab4531f Merge branch 'release-4.2' 2025-12-01 12:29:52 -05:00
Brad King
ec61c198b0 Merge topic 'stdio-ctrl-c'
e419429616 StdIo: Restore Windows Console I/O modes on Ctrl-C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11457
2025-12-01 12:29:52 -05:00
Brad King
d79bcf219c Merge topic 'stdio-ctrl-c' into release-4.2
e419429616 StdIo: Restore Windows Console I/O modes on Ctrl-C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11457
2025-12-01 12:29:49 -05:00
Brad King
b43eb123e4 Merge topic 'stdio-ctrl-c' into release-4.1
e419429616 StdIo: Restore Windows Console I/O modes on Ctrl-C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11457
2025-12-01 12:27:59 -05:00
Matthew Woehlke
b2ca9fba8b CPS: Fix exporting definitions in CMake 4.1
Backport commit 37b15eda3b (CPS: Fix exporting definitions, 2025-11-21)
to CMake 4.1.

Export compile definitions to CPS using the correct attribute name.

Fixes: #27403
2025-12-01 12:15:51 -05:00
Matthew Woehlke
41b6b07527 cmExportCommand: Fix PACKAGE_INFO argument parsing
While I'm unsure about why `cmPackageInfoArguments` was originally
written the way it was, in its current form, the way command sub-parsers
work, the parser never considers arguments associated with a sub-parser
if the sub-parser keyword isn't present. This means that the arguments
associated with `cmPackageInfoArguments` are treated as unknown, and the
logic to reject them being set if `PACKAGE_INFO` is not present can
never actually execute. Therefore, remove it, and remove the associated
(and effectively useless) `enable` argument to its `Check` method.

Instead, ensure that the package name is actually specified. The only
case in which the parser will create the `optional` associated with the
sub-parser arguments is if the relevant keyword (i.e. `PACKAGE_INFO`) is
present. However, while the associated value is `NonEmpty`, the way we
are using the parser does not actually enforce this, and it looks like a
correct fix may be a breaking change. Therefore, enforce it manually for
now.
2025-12-01 11:22:58 -05:00
AJIOB
cd5f7eb30a Help: improve XZ compression method docs
Relates: #27429
2025-12-01 08:42:32 +03:00
Kitware Robot
3cd055ec6d CMake Nightly Date Stamp 2025-12-01 00:06:36 -05:00
Kitware Robot
8b74f7eda9 CMake Nightly Date Stamp 2025-11-30 00:09:59 -05:00
Kitware Robot
ef5f25ba97 CMake Nightly Date Stamp 2025-11-29 00:13:42 -05:00
Kitware Robot
2d88cb03d0 CMake Nightly Date Stamp 2025-11-28 00:12:03 -05:00
Kitware Robot
3a5b5f5da7 CMake Nightly Date Stamp 2025-11-27 00:08:21 -05:00
Matthew Woehlke
cc508826b4 CPS: Validate package version
Add version validation to cmExportPackageInfoGenerator. Specifically, if
a package uses the "simple" version schema (which is the default if no
schema is specified), validate that the specified version actually
conforms to the schema and issue an error if it does not. Also, issue a
warning if the schema is not recognized.
2025-11-26 17:04:26 -05:00
Matthew Woehlke
fb66a14da2 cmExportFileGenerator: Allow other message types
Export generators sometimes need to issue errors, and we had an existing
API for that. However, in the future, it will be useful to issue
non-fatal diagnostics as well. Rework the API to allow specifying the
type of diagnostic to issue.
2025-11-26 17:04:26 -05:00
Cristiano Carvalheiro
a46491d0d3 cmLocalGenerator: Improve performance of source group lookups
Introduce an index from source file to source group in
`cmLocalGenerator` to make lookups significantly more efficient
during the source group generation, which could be particularly
slow when dealing with thousands of source files.
Falls back to the recursive lookup when the source file is not present
on the index, which is more likely to happen when dealing with
regex-based sources.

Fixes: #27359
2025-11-26 20:32:19 +00:00
Brad King
e419429616 StdIo: Restore Windows Console I/O modes on Ctrl-C
Extend commit fb3e7825f3 (StdIo: Restore Windows Console I/O modes on
exit, 2025-05-23, v4.1.0-rc1~114^2) to cover termination by Ctrl-C.

Fixes: #27427
2025-11-26 15:18:03 -05:00
Cristiano Carvalheiro
caf6e782e1 cmSourceGroup: Move FindSourceGroup out of cmMakefile 2025-11-26 18:16:05 +00:00
Cristiano Carvalheiro
de2afc5d53 cmMakeFile: Remove source groups argument from FindSourceGroup 2025-11-26 17:39:02 +00:00
Cristiano Carvalheiro
1dcebce19f cmSourceGroup: Fix typos and improve methods const correctness 2025-11-26 17:39:02 +00:00
Cristiano Carvalheiro
0ff69e0da2 VS: remove unused argument from WriteProjectStart 2025-11-26 17:39:02 +00:00
Ilia Motornyi
50b53d1952 Help: Fix QNX cross-compile example toolchain file
`q++` is the correct name for C++ compiler.

QNX does not support ARM32 anymore.  Use `aarch64` instead.
2025-11-26 11:50:04 -05:00
Brad King
767946d1e3 Merge branch 'release-4.2' 2025-11-26 10:47:32 -05:00
Brad King
978ef6fee7 Merge topic 'renesas_compiler_toolchain_doc'
6139bb7903 Help: Document Renesas compiler toolchain

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11446
2025-11-26 10:47:31 -05:00
Brad King
d4539f6f85 Merge topic 'renesas_compiler_toolchain_doc' into release-4.2
6139bb7903 Help: Document Renesas compiler toolchain

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11446
2025-11-26 10:47:28 -05:00