mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 00:00:39 -05:00
Code Issues Packages Projects Releases Wiki Activity
73,962 Commits 2 Branches 401 Tags
4e1dfc51943f4678ff493b885c3ca545107827d4
Commit Graph

73962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Yankee 4e1dfc5194 Tests: Print concise error in JSON schema validation 
By default, `validate` can print the entire schema upon error in some
failure cases. Printing just the message instead is just as informative
and reduces spam while debugging.
 2026-01-24 21:17:17 -05:00
Brad King f841f74290 Merge branch 'release-4.2' 2026-01-24 08:06:36 -05:00
Brad King fdbcf85d86 Merge branch 'release-4.1' 2026-01-24 08:06:23 -05:00
Brad King ecec7b6e4c Merge branch 'release-4.0' 2026-01-24 08:06:16 -05:00
Brad King 6f9015c5ef Merge branch 'release-3.31' 2026-01-24 08:06:10 -05:00
Brad King de106079a3 Merge branch 'release-4.1' into release-4.2 2026-01-24 08:05:44 -05:00
Brad King 8b2cd2ad7f Merge branch 'release-4.2' 2026-01-24 08:04:35 -05:00
Brad King e88e085bfb Merge topic 'libarchive-windows-encoding' 
f590010167 libarchive: Restore tolerance of archives with non-OEM paths on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Overchenko <aleksandr9809@gmail.com>
Merge-request: !11622
 2026-01-24 08:04:34 -05:00
Brad King 0e4342ee25 Merge topic 'libarchive-windows-encoding' into release-4.2 
f590010167 libarchive: Restore tolerance of archives with non-OEM paths on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Overchenko <aleksandr9809@gmail.com>
Merge-request: !11622
 2026-01-24 08:04:33 -05:00
Brad King 08d6132bc1 Merge branch 'release-4.0' into release-4.1 2026-01-24 08:03:54 -05:00
Brad King b907505c08 Merge topic 'libarchive-windows-encoding' into release-4.1 
f590010167 libarchive: Restore tolerance of archives with non-OEM paths on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11622
 2026-01-24 08:03:39 -05:00
Brad King 449ffb2539 Merge branch 'release-3.31' into release-4.0 2026-01-24 08:03:32 -05:00
Brad King 8b19487cbb Merge topic 'libarchive-windows-encoding' into release-4.0 
f590010167 libarchive: Restore tolerance of archives with non-OEM paths on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11622
 2026-01-24 08:03:24 -05:00
Brad King ab1152c3ac Merge topic 'libarchive-windows-encoding' into release-3.31 
f590010167 libarchive: Restore tolerance of archives with non-OEM paths on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11622
 2026-01-24 08:01:35 -05:00
Brad King 1fba1a17c3 Merge topic 'instrumentation-docs-result' 
65014c0ee3 Help/instrumentation: Fix "result" key in example snippet file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11624
 2026-01-24 08:00:52 -05:00
Brad King b6a60d9ebe Merge topic 'FindRuby-components' 
c5e7cb691c FindRuby: Add support for interpreter and development components
dc8e05c4d2 FindRuby: Simplify finding the Ruby library - Ruby already knows!
b192f706aa FindRuby: Remove broken, untested and unmaintained cross-compiling support
ee75b3e7b4 FindRuby: Clean up variables read from Ruby
ba37066185 FindRuby: Versions are strings not paths.
b2bd6b221c FindRuby: Enclose Ruby executable in quotes
752d5cace6 FindRuby: Fix incorrect code and versions
deb67fa837 FindRuby: Remove duplicate word
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Osyotr <zhenchik35026@gmail.com>
Merge-request: !11544
 2026-01-24 07:58:49 -05:00
Brad King 5f44fc5e2c Merge topic 'bin2c-fix-template-placeholder-args' 
3a45596703 cmake -E bin2c: Fix segfault in template placeholder options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11623
 2026-01-24 07:57:45 -05:00
Brad King f590010167 libarchive: Restore tolerance of archives with non-OEM paths on Windows 
On Windows, since commit 9539a0df9c (LibArchive 2024-09-13, 2024-09-13,
v3.31.0-rc1~77^2~3^2) imported libarchive commit `49280bc202a8` (Fix
tests on Windows, 2024-03-23, `v3.7.3~17`), libarchive fails to extract
archives whose paths are not valid MBS encodings in the host's OEM code
page.  This broke extraction, e.g., by `cmake -E tar` of archives with
UTF-8 paths on Windows.

Restore compatibility with CMake 3.30 and below by tolerating encoding
conversion errors on Windows.  Although affected paths are not extracted
correctly, we at least succeed in extracting the rest of such archives.

Issue: #26903
 2026-01-24 07:53:54 -05:00
Kitware Robot 99b5401ef7 CMake Nightly Date Stamp 2026-01-24 00:06:33 -05:00
Martin Duffy 65014c0ee3 Help/instrumentation: Fix "result" key in example snippet file 
Snippet file example erroneously included a key of "return" instead of "result".
 2026-01-23 17:04:27 -05:00
Charlie Savage c5e7cb691c FindRuby: Add support for interpreter and development components 2026-01-23 10:35:43 -05:00
Charlie Savage dc8e05c4d2 FindRuby: Simplify finding the Ruby library - Ruby already knows! 2026-01-23 10:35:43 -05:00
Charlie Savage b192f706aa FindRuby: Remove broken, untested and unmaintained cross-compiling support 2026-01-23 10:35:43 -05:00
Charlie Savage ee75b3e7b4 FindRuby: Clean up variables read from Ruby 2026-01-23 10:35:43 -05:00
Charlie Savage ba37066185 FindRuby: Versions are strings not paths. 2026-01-23 10:35:43 -05:00
Charlie Savage b2bd6b221c FindRuby: Enclose Ruby executable in quotes 2026-01-23 10:35:43 -05:00
Charlie Savage 752d5cace6 FindRuby: Fix incorrect code and versions 2026-01-23 10:35:42 -05:00
Charlie Savage deb67fa837 FindRuby: Remove duplicate word 2026-01-23 10:35:42 -05:00
Charlie Savage dba840934c FindRuby: Add Ruby 4.0 support 2026-01-23 10:35:42 -05:00
Charlie Savage 56b3437108 FindRuby: Fix finding headers on Github MacOS runners using Brew 2026-01-23 10:35:42 -05:00
Kyle Edwards 3a45596703 cmake -E bin2c: Fix segfault in template placeholder options 
If --template-array-placeholder or --template-length-placeholder
were specified without --template-file, a segfault resulted from
trying to read from a std::istream* that was set to nullptr.
Explicitly check to see if these options are set without
--template-file.
 2026-01-23 10:33:10 -05:00
Charlie Savage aebf563257 Tests/RunCMake/FindRuby: Fix RVM tests 
Also improve error messages.
 2026-01-23 10:32:00 -05:00
Brad King a436fbdbc2 Tests/RunCMake/FindRuby: Use environment as of test time, not configure time 
Revise commit a9ded64779 (FindRuby: Convert tests to RunCMake, 2026-01-15).
 2026-01-23 10:22:48 -05:00
Kyle Edwards a4d9a20c49 Merge topic 'bin2c' 
3dd49d857a ci: Enable bin2c large file test on some builds
3a893806bb cmake -E: Add bin2c mode
8cca26e562 cm::optional: Suppress GCC -Wmaybe-uninitialized false positive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !11536
 2026-01-23 10:05:58 -05:00
Brad King 9461f0c8e2 Merge topic 'dyndep-manifest-support' 
ef7533113d cmake-cxxmodule: Document cxx-modules map members
dddd0794c1 cmCxxModuleMetadata: Don't serialize default values
ce309f8885 cmDyndepCollation: Cxx module manifest format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !11617
 2026-01-23 09:01:04 -05:00
Brad King 089b18195d Merge topic 'instrumentation-custom-content-empty' 
71fe659641 instrumentation: Write empty JSON object when custom content is empty

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11619
 2026-01-23 08:59:46 -05:00
Brad King f96fbe208b Merge topic 'instrumentation-ci' 
5ede033f57 ci: Add job for instrumentation on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11517
 2026-01-23 08:56:59 -05:00
Brad King 69956a1791 Merge topic 'update-zstd' 
ef4806cf76 zstd: Update our CMake build system for 1.5.7
b352f91585 Merge branch 'upstream-zstd' into update-zstd
9f5d8ba3ac zstd 2025-02-18 (f8745da6)
968b7e0b2b zstd: Update script to get zstd 1.5.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex Overchenko <aleksandr9809@gmail.com>
Merge-request: !11618
 2026-01-23 08:54:36 -05:00
Brad King 1256f02bc6 Merge topic 'link-flags-runcmake' 
3ea9d225f7 Tests: Port LinkFlags test to RunCMake
e41256b568 Tests: Move LinkFlags static tests to RunCMake.LinkStatic
d38c268f4d Tests/LinkStatic: Standardize RunCMake use where possible
48e08cb757 Tests/RunCMake: Fix typos in README.rst
12089b576c Tests/RunCMake: Prefer `RunCMake_TEST_EXPECT_*` if set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11615
 2026-01-23 08:52:17 -05:00
Kitware Robot 4238884880 CMake Nightly Date Stamp 2026-01-23 00:07:26 -05:00
Brad King 4656652da2 Merge topic '3p-update-common-script' 
5ffb9c9901 update-third-party: sync with upstream

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11620
 2026-01-22 16:38:59 -05:00
Ben Boeckel 5ffb9c9901 update-third-party: sync with upstream 
Fixes usage on Apple and defers shortlog generation until it is
necessary.
 2026-01-22 15:30:28 -05:00
Kyle Edwards 3dd49d857a ci: Enable bin2c large file test on some builds 
This test should be enabled on at least one 32-bit build, at least
one 64-bit build, and at least one Windows build. These builds
fulfill these requirements.
 2026-01-22 14:33:17 -05:00
Kyle Edwards 3a893806bb cmake -E: Add bin2c mode 
Run Tests/RunCMake/cmake-E-bin2c/generate_files.sh to regenerate the
following files:

- Tests/RunCMake/cmake-E-bin2c/long.c.txt
- Tests/RunCMake/cmake-E-bin2c/long_signed.c.txt
- Tests/RunCMake/cmake-E-bin2c/long_decimal.c.txt
- Tests/RunCMake/cmake-E-bin2c/long_signed_decimal.c.txt
- Tests/RunCMake/cmake-E-bin2c/hashes.cmake

Run it with --very-long to regenerate the following additional files:

- Tests/RunCMake/cmake-E-bin2c/very_long_params.cmake
 2026-01-22 14:33:17 -05:00
Martin Duffy 71fe659641 instrumentation: Write empty JSON object when custom content is empty 
Replaces the previous value of `null` when no `CUSTOM_CONTENT` was specified.
 2026-01-22 13:20:12 -05:00
Martin Duffy 5ede033f57 ci: Add job for instrumentation on Linux 2026-01-22 10:41:11 -05:00
Brad King ebf93da48b Merge branch 'release-4.2' 2026-01-22 10:14:33 -05:00
Brad King 176604ba0b Merge branch 'release-4.1' 2026-01-22 10:14:27 -05:00
Brad King b6d9e64531 Merge branch 'release-4.0' 2026-01-22 10:14:20 -05:00
Brad King 6e083dafb0 Merge branch 'release-3.31' 2026-01-22 10:14:15 -05:00