Commit Graph
77008 Commits
Author SHA1 Message Date
Brad King eb708db6f8 Merge topic 'sphinx-copybutton'
392a79b910 Help/dev: Document use of sphinx-copybutton
1c5e70c9d0 bootstrap: Add --sphinx-html-copybutton option
1b1225a766 ci: Enable Sphinx copybutton for cmake.org and Sphinx jobs
6e2301357d ci: Add sphinx-copybutton extension to Fedora base image
ad5a65dd34 Utilities/Sphinx: Add option to build with copybutton
59875d4a08 Tests/FindImageMagick: Tolerate pre-release versions
45a426a4e3 codespell: Fix some hyphenated spellings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12424
2026-08-24 11:34:23 -04:00
Brad King 916316bb35 Merge topic 'cleaner-clang-tidy-config'
29c1363fdd clang-tidy: Use folded-block string for checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12416
2026-08-24 11:14:02 -04:00
Brad King cb3d63a245 Merge topic 'jsonstate-pkginforeader'
b14b613cec CPS: Use cmJSONState to read package JSON files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12414
2026-08-24 11:11:18 -04:00
Brad King cb89e8d15f Merge topic 'jsonstate-ninja'
26f6dab469 Ninja: Use cmJSONState for -E cmake_ninja_* commands
3796649167 cmJSONState: Avoid UB on empty error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12405
2026-08-24 11:06:43 -04:00
Brad King 4b056e6cc0 Merge topic 'test-solaris-sh'
cb7a738f62 Tests: Fix RunCMake.CommandLine test on Solaris 10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12417
2026-08-24 10:55:54 -04:00
Brad King 958117098d Merge topic 'Help-review-test-tag'
ed603380f1 Help/dev/review: mention the new `Do: test --tag` flag
67e086d29c Help/dev/review: mention behavior of multiple `Do: test --stage` behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12412
2026-08-24 10:52:35 -04:00
Kitware Robot b7b55e306b CMake Nightly Date Stamp 2026-08-24 00:10:44 -04:00
Kitware Robot 30a6e89923 CMake Nightly Date Stamp 2026-08-23 00:05:48 -04:00
Kitware Robot 03676b051d CMake Nightly Date Stamp 2026-08-22 00:05:25 -04:00
Tyler Yankee 392a79b910 Help/dev: Document use of sphinx-copybutton
Add a section on third-party Sphinx extensions. While we're here, add
a cross-reference on CMake's `README.rst`.
2026-08-21 09:43:48 -04:00
Tyler Yankee 1c5e70c9d0 bootstrap: Add --sphinx-html-copybutton option
Consistent with the SPHINX_HTML_COPYBUTTON CMake option.
2026-08-21 09:43:48 -04:00
Tyler Yankee 1b1225a766 ci: Enable Sphinx copybutton for cmake.org and Sphinx jobs 2026-08-21 09:43:48 -04:00
Brad King 6e2301357d ci: Add sphinx-copybutton extension to Fedora base image
Make it available to our documentation jobs.
2026-08-21 09:43:48 -04:00
Tyler Yankee ad5a65dd34 Utilities/Sphinx: Add option to build with copybutton
The copy button is convenient for copying code blocks from CMake's
documentation pages, and can be especially helpful when following the
CMake tutorial. It is implemented optionally so that developers without
the extension installed locally can still preview the site.

Fixes: #28046
2026-08-21 09:43:48 -04:00
Tyler Yankee 59875d4a08 Tests/FindImageMagick: Tolerate pre-release versions
The version installed from the system in our new Fedora 44 CI base
image has a beta version of ImageMagick installed, which the
FindImageMagick module can't parse.
2026-08-21 09:43:48 -04:00
Tyler Yankee 45a426a4e3 codespell: Fix some hyphenated spellings
These were surfaced by an updated `codespell` in the `spellcheck` CI
base image.
2026-08-21 09:43:48 -04:00
Brad King dd1580ba69 Merge topic 'autouic-document-ui-header-path'
3329328e5c Help: AUTOUIC: Document how generated ui header files are named

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12419
2026-08-21 09:38:38 -04:00
Brad King e2a8abcb03 Merge topic 'update-kwsys'
21063dc0c0 Merge branch 'upstream-KWSys' into update-kwsys
32911ff9d2 KWSys 2026-08-21 (c1021f19)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12418
2026-08-21 08:56:01 -04:00
Brad King 21063dc0c0 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2026-08-21 (c1021f19)
2026-08-21 08:52:45 -04:00
KWSys Upstream 32911ff9d2 KWSys 2026-08-21 (c1021f19)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit c1021f197a13598595ac0a268001c78280a9029c (master).

Upstream Shortlog
-----------------

Ben Boeckel (1):
      9c6e68a4 SystemInformation: remove unused variable
2026-08-21 08:52:45 -04:00
Kitware Robot c5a5c4a6e2 CMake Nightly Date Stamp 2026-08-21 00:07:47 -04:00
Joerg Bornemann 3329328e5c Help: AUTOUIC: Document how generated ui header files are named
The name of a generated ui header follows the '#include' directive that
requests it, not the location of the .ui file.  That was not written down,
and neither was the optional directory prefix such a directive may carry.

CMake nevertheless has to predict the name at configure time, in order to
register the generated header as a source of the targets in the directory.
The prediction assumes that the include prefix matches the location of the
.ui file relative to CMAKE_CURRENT_SOURCE_DIR, so it is wrong when the .ui
file lies outside of that directory, or lies in a subdirectory but is
included without a prefix.

Document both, along with the resulting symptoms, and point to Qt's
qt_add_ui() command, which takes the include prefix explicitly and
therefore needs no prediction at all.

Issue: #23523
2026-08-20 15:00:09 +02:00
Tyler Yankee 26f6dab469 Ninja: Use cmJSONState for -E cmake_ninja_* commands
This approach will be more portable.
2026-08-20 08:38:56 -04:00
Tyler Yankee 3796649167 cmJSONState: Avoid UB on empty error message
The caller for `GetErrorMessage` _should_ only be calling this method
if there actual errors (i.e., `!errors.empty()`). However, in the
incidental absence of the intended usage, avoid `pop_back` on an empty
string.
2026-08-20 08:37:00 -04:00
Kitware Robot 419e5f0d6b CMake Nightly Date Stamp 2026-08-20 00:05:54 -04:00
Ben Boeckel ed603380f1 Help/dev/review: mention the new Do: test --tag flag 2026-08-19 22:25:04 -04:00
Ben Boeckel 67e086d29c Help/dev/review: mention behavior of multiple Do: test --stage behavior 2026-08-19 22:24:55 -04:00
Tyler Yankee b14b613cec CPS: Use cmJSONState to read package JSON files
This approach will be more portable.
2026-08-19 19:05:07 -04:00
Brad King cb7a738f62 Tests: Fix RunCMake.CommandLine test on Solaris 10
Fix the shell script from commit 03e56cd338 (Tests: Add cases covering
`nm` handling for WINDOWS_EXPORT_ALL_SYMBOLS, 2026-07-27) to work on a
Solaris 10 host.
2026-08-19 18:14:58 -04:00
Kitware Robot 80066f9851 CMake Nightly Date Stamp 2026-08-19 00:18:01 -04:00
Matthew Woehlke 29c1363fdd clang-tidy: Use folded-block string for checks
Use a YAML folded-block string literal rather than a quoted literal with
line continuation characters for listing clang-tidy checks. This allows
the values to start on the next line and to be indented, and avoids
needing a closing double-quote and the need to end every line with a
backslash.
2026-08-18 16:06:48 -04:00
Kitware Robot b13cdb037c CMake Nightly Date Stamp 2026-08-18 00:07:21 -04:00
Kitware Robot f0952e573f CMake Nightly Date Stamp 2026-08-17 00:05:43 -04:00
Kitware Robot 7bb8d9da1f CMake Nightly Date Stamp 2026-08-15 00:05:23 -04:00
Brad King 03f6a7f440 Merge topic 'jsonstate-builddb'
e42cde3405 cmBuildDatabase: Use cmJSONState to read mcdb's

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12406
2026-08-14 06:40:09 -04:00
Brad King 450f54656e Merge topic 'jsonstate-vs-flagtable'
e2da85c672 VS: Use cmJSONState to read flag table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12404
2026-08-14 06:38:43 -04:00
Brad King 0c196bc58e Merge topic 'update-libuv'
9fdcbaae06 Merge branch 'upstream-libuv' into update-libuv
66adcb206d libuv 2026-03-11 (d2a45ce3)
4c61484f5c libuv: Update script to get libuv 1.52.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12402
2026-08-14 06:37:11 -04:00
Brad King ae2dd9a2d1 Merge topic 'update-kwsys'
b06e6b412f Merge branch 'upstream-KWSys' into update-kwsys
3db61dc184 KWSys 2026-08-14 (f87534bd)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12401
2026-08-14 06:35:38 -04:00
Brad King f254d78638 Merge topic 'remove_message_prefix'
4eece9b32c cmake_language: Remove extraneous MESSAGE_PREFIX param

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12400
2026-08-14 06:34:14 -04:00
Brad King 1814d17624 Merge branch 'release-4.4' 2026-08-14 06:30:36 -04:00
Brad King ca0ed0f66f Merge topic 'swift-cmp0215-update'
e4a37fbf15 Tests/RunCMake/Swift: Add CMP0195 behavior checks
b7a78568c3 CMP0215: Update NEW behavior to require CMP0157/CMP0195 to be NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12407
2026-08-14 06:30:36 -04:00
Brad King 1e1b1bef21 Merge topic 'swift-cmp0215-update' into release-4.4
e4a37fbf15 Tests/RunCMake/Swift: Add CMP0195 behavior checks
b7a78568c3 CMP0215: Update NEW behavior to require CMP0157/CMP0195 to be NEW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12407
2026-08-14 06:30:34 -04:00
KWSys Upstream 3db61dc184 KWSys 2026-08-14 (f87534bd)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit f87534bd3ddedb6428ca3155852cd8b65cf09f32 (master).

Upstream Shortlog
-----------------

Ben Boeckel (2):
      3d74d809 SystemInformation: clean up memory allocated with `SymInitialize`
      57792988 SystemInformation: avoid reporting unrelated symbols

Jaswant Panchumarti (1):
      f22a3c0f SystemInformation: restore support for symbols without PDB files

Jeremy Nimmer (1):
      fbc6ddc9 SystemTools: mark impl functions as `static`
2026-08-14 06:29:09 -04:00
Brad King b06e6b412f Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2026-08-14 (f87534bd)
2026-08-14 06:29:09 -04:00
Kitware Robot d39eee10b3 CMake Nightly Date Stamp 2026-08-14 00:11:42 -04:00
Evan Wilde e4a37fbf15 Tests/RunCMake/Swift: Add CMP0195 behavior checks
Adding checks to ensure that CMP0195 has the desired effect. If the
Swift compiler is too old and does not include the module triple in the
emitted target info, we won't set `CMAKE_Swift_MODULE_TRIPLE` and end up
with the flat directory structure. In this case, these tests won't have
the expected layout.

Issue: #28021
2026-08-13 10:18:16 -04:00
Evan Wilde b7a78568c3 CMP0215: Update NEW behavior to require CMP0157/CMP0195 to be NEW
Update CMP0215 to avoid attempting to iterate through the flags
looking for `-emit-module-path` ins the user-specified flags. We don't
do this anywhere else in the code. The existing implementation didn't
handle correctly parsing the flag so `-I blah/my-emit-module-path/` and
`-Xcc -emit-module-path ...` would both trigger it, result in the
compiler not emitting any module. Furthermore, it didn't include the
user-specified module path as part of the build graph resulting in an
incorrect build graph that would never resolve.

The only two appropriate layouts for the module are either the flat
binary module file with the name `<module-name>.swiftmodule`, or the
nested form with
`<module-name>.swiftmodule/<module-triple>.swiftmodule`. The noted
Swift-Syntax situation passes the explicit `-emit-module-path` to get to
the latter form. This form is automatically emitted by CMake when
CMP0195 is `NEW`, removing the need for the flag. The Swift project
generally recommends the nested directory structure since it gathers all
of the generated interface outputs from the compiler (textual swift
interfaces, swiftdoc, sourceinfo, and the binary swiftmodule file) in a
single place, and since it uses the module triple in the filename,
cleanly allows fat mach-o binaries on Apple platforms.

Fixes: #28021
2026-08-13 10:14:16 -04:00
Brad King 9fdcbaae06 Merge branch 'upstream-libuv' into update-libuv
# By libuv upstream
* upstream-libuv:
  libuv 2026-03-11 (d2a45ce3)
2026-08-13 09:52:24 -04:00
libuv upstream 66adcb206d libuv 2026-03-11 (d2a45ce3)
Code extracted from:

    https://github.com/libuv/libuv.git

at commit d2a45ce364ed97e916be3bcecfd756f15d852473 (d2a45ce364ed97e916be3bcecfd756f15d852473).
2026-08-13 09:52:24 -04:00
Brad King 4c61484f5c libuv: Update script to get libuv 1.52.1
Use a commit just after the v1.52.1 tag to get some compilation fixes.
2026-08-13 09:52:19 -04:00