Commit Graph

71225 Commits

Author SHA1 Message Date
Brad King
e5dc5dfe10 Merge topic 'cuda-nonexistent-compiler-path'
bf442068bb CUDA: Improve error message for nonexistent compiler paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10933
2025-07-09 09:43:29 -04:00
Kitware Robot
51e22572ed CMake Nightly Date Stamp 2025-07-09 00:04:52 -04:00
Robert Maynard
bf442068bb CUDA: Improve error message for nonexistent compiler paths
Fixes: #25709
2025-07-08 09:58:37 -04:00
Brad King
64b35e8fcb Merge topic 'gtest-use-json-output-for-discovery'
088b0af2f9 GoogleTest: Fix naming of tests with named parameters
3f780c3fde GoogleTest: Set DEF_SOURCE_LINE on tests if file and line are known
1cdceae8e3 GoogleTest: Parse discovered test list from JSON output if supported
07d14c21a9 GoogleTest: Add tests for NO_PRETTY_VALUES and NO_PRETTY_TYPES
54bb974b27 GoogleTest: Add tests for named parameters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dennis Lambe <malsyned_kitware@malsyned.net>
Merge-request: !10739
2025-07-08 09:40:03 -04:00
Kitware Robot
49d5d9f708 CMake Nightly Date Stamp 2025-07-08 00:04:52 -04:00
Dennis Lambe Jr.
088b0af2f9 GoogleTest: Fix naming of tests with named parameters
Recent changes to the JSON and stdout parsers changed the current test
names from an unintentional bug to an intentional compatibility hack.
This commit removes that compatibility hack and makes tests with named
parameters follow the same naming conventions as tests with numbered
parameters.

Fixes: #26939
2025-07-08 07:58:35 +10:00
Ottmar Zittlau
3f780c3fde GoogleTest: Set DEF_SOURCE_LINE on tests if file and line are known
This information is available when --gtest_output=json is supported,
which it almost always is on GoogleTest >= 1.8.1.
2025-07-08 07:58:34 +10:00
Ottmar Zittlau
1cdceae8e3 GoogleTest: Parse discovered test list from JSON output if supported
The --gtest_output=json option is supported from gtest 1.8.1 onwards.
Earlier versions output a warning about it being an unrecognized option,
and builds that #define GTEST_HAS_FILE_SYSTEM 0 output an error about it
being unsupported, but in both cases still continue outputting the same
plain text output as before and return an exit code of 0.

We now add that option and check for whether the JSON file is generated,
falling back to parsing the plain text output as before if it isn't or
if the environment variable NO_GTEST_JSON_OUTPUT is set.

The fake executor binaries are sensitive to parameter order. This commit
adds --gtest_output:json arguments to a number of tests added for the
new JSON parser. The argument order has been adjusted for the
invocations of those binaries.

Co-Authored-By: Craig Scott <craig.scott@crascit.com>
Co-Authored-By: Dennis Lambe Jr. <malsyned@malsyned.net>
2025-07-08 07:58:34 +10:00
Brad King
5525104cd0 Merge topic 'update-kwsys'
14891241ec Merge branch 'upstream-KWSys' into update-kwsys
9d2ef414ba KWSys 2025-07-07 (2f3a7814)
7c8e4687b9 ci: configure 'typos' to tolerate all 8-12 character hex identifiers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10920
2025-07-07 13:23:47 -04:00
Brad King
ada38fa12a Merge topic 'cps-test-empty-config'
4bb4bbcf59 Tests: Actually test CPS generation with no config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Reviewed-by: Vito Gamberini <vito.gamberini@kitware.com>
Merge-request: !10926
2025-07-07 11:26:52 -04:00
Brad King
14891241ec Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2025-07-07 (2f3a7814)
2025-07-07 11:23:55 -04:00
KWSys Upstream
9d2ef414ba KWSys 2025-07-07 (2f3a7814)
Code extracted from:

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

at commit 2f3a7814cf53af23809b2dcec1dbe5eed45cfb43 (master).

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

Daniel Pfeifer (5):
      fd4c4235 Reference test executables by target name
      0725a089 SystemInformation: Remove redundant attempt to use OSVERSIONINFO
      136db938 SystemInformation: Remove unused variable bIsWindows64Bit
      41d44dbe SystemInformation: Rewrite OSRelease and OSVersion on Windows
      7d0a468c TestsCxx: Add an application manifest for Windows
2025-07-07 11:23:54 -04:00
Brad King
ecb480fb38 Merge branch 'release-4.1' 2025-07-07 11:18:02 -04:00
Brad King
6ffcca0424 Merge topic 'doc-file-api-omissions'
da73f6b058 Help: Add cxxModuleBmi details missing from file API and release notes
bef17abc09 Help: Add file API fileSet... fields missed in the 3.23 release notes
094436db98 Help: The fileSets item in a codemodel target object is optional
1398ef18c2 Help: Add missing backtrace property to compileCommandFragments
74d70d13cd Help: Fix repeated word in file API docs for sourceFileExtensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10913
2025-07-07 11:18:02 -04:00
Brad King
b557cd0f49 Merge topic 'doc-file-api-omissions' into release-4.1
da73f6b058 Help: Add cxxModuleBmi details missing from file API and release notes
bef17abc09 Help: Add file API fileSet... fields missed in the 3.23 release notes
094436db98 Help: The fileSets item in a codemodel target object is optional
1398ef18c2 Help: Add missing backtrace property to compileCommandFragments
74d70d13cd Help: Fix repeated word in file API docs for sourceFileExtensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10913
2025-07-07 11:18:00 -04:00
Kitware Robot
7a5dc2b32b CMake Nightly Date Stamp 2025-07-07 00:07:26 -04:00
Kitware Robot
babeb502f4 CMake Nightly Date Stamp 2025-07-06 00:04:40 -04:00
Kitware Robot
6903385999 CMake Nightly Date Stamp 2025-07-05 00:04:17 -04:00
Kitware Robot
be4ec6a11e CMake Nightly Date Stamp 2025-07-04 00:04:24 -04:00
Craig Scott
da73f6b058 Help: Add cxxModuleBmi details missing from file API and release notes
Fixes: #27028
2025-07-04 11:01:15 +10:00
Craig Scott
bef17abc09 Help: Add file API fileSet... fields missed in the 3.23 release notes 2025-07-04 10:34:33 +10:00
Craig Scott
094436db98 Help: The fileSets item in a codemodel target object is optional 2025-07-04 10:34:32 +10:00
Craig Scott
1398ef18c2 Help: Add missing backtrace property to compileCommandFragments
Fixes: #27030
2025-07-04 10:34:32 +10:00
Craig Scott
74d70d13cd Help: Fix repeated word in file API docs for sourceFileExtensions 2025-07-04 10:31:34 +10:00
Matthew Woehlke
4bb4bbcf59 Tests: Actually test CPS generation with no config
Commit 58d9950842 (CPS: Fix empty configuration field on noconfig
builds, 2025-06-30) fixed an issue with CPS generation that would
incorrectly use the empty string to identify the configuration in some
instances. (The expected CMake behavior is that an empty configuration
is always equivalent to 'noconfig'.) However, that commit did not add
any tests for the fix.

Add those tests now. Also, tweak the tests that were added, that test
for expected non-empty configuration-specific content, to hard-code what
configuration or configurations are produced. Lastly, remove the
explicit test for existence of the CPS file in said tests; `file(READ)`
will complain if the file does not exist, so the separate test is
superfluous.
2025-07-03 13:58:31 -04:00
Brad King
a6245c9bf6 Merge topic 'cps-file-set'
7db44fbfb8 CPS: Support FILE_SET HEADERS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10906
2025-07-03 13:04:50 -04:00
Brad King
bc07a21836 Merge topic 'post-rel-dev'
8071304f2e Configure CMake itself with policies through CMake 4.0
f7380d8c4a export: Increase maximum policy version in exported files to 4.0
94ff184a63 Add deprecation warnings for policies CMP0143 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10925
2025-07-03 13:03:14 -04:00
Brad King
8d3e9a7bf7 Merge branch 'release-4.1' 2025-07-03 13:01:27 -04:00
Brad King
56958a94bb Merge topic 'GNUInstallDirs-cached-default'
5071c93a78 GNUInstallDirs: Fix regression on -DCMAKE_INSTALL_<dir>=<default>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Cristian Le <github@lecris.me>
Merge-request: !10921
2025-07-03 13:01:27 -04:00
Brad King
567ce02d48 Merge topic 'GNUInstallDirs-cached-default' into release-4.1
5071c93a78 GNUInstallDirs: Fix regression on -DCMAKE_INSTALL_<dir>=<default>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Cristian Le <github@lecris.me>
Merge-request: !10921
2025-07-03 13:01:25 -04:00
Brad King
3882ec172b Merge branch 'release-4.1' 2025-07-03 12:59:50 -04:00
Brad King
2fa41616ad Merge topic 'curl-prefill'
759c6fd6a1 curl: Restore configuration checks on UNIX platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10924
2025-07-03 12:59:50 -04:00
Brad King
63557ea7a1 Merge topic 'curl-prefill' into release-4.1
759c6fd6a1 curl: Restore configuration checks on UNIX platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10924
2025-07-03 12:59:48 -04:00
Brad King
17a139451b Merge branch 'release-4.1' 2025-07-03 12:58:33 -04:00
Brad King
62c8d7207b Merge topic 'doc-cmake_path'
41488e0c41 Help: Fix cmake_path examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10923
2025-07-03 12:58:32 -04:00
Brad King
529279ea00 Merge topic 'doc-cmake_path' into release-4.1
41488e0c41 Help: Fix cmake_path examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10923
2025-07-03 12:58:31 -04:00
Kitware Robot
7dae5d8aa1 CMake Nightly Date Stamp 2025-07-03 06:44:51 -04:00
Vito Gamberini
7db44fbfb8 CPS: Support FILE_SET HEADERS
Fixes: #26806
2025-07-02 10:34:10 -04:00
xndcn
41488e0c41 Help: Fix cmake_path examples 2025-07-02 09:54:18 -04:00
Brad King
8071304f2e Configure CMake itself with policies through CMake 4.0 2025-07-02 09:42:26 -04:00
Brad King
f7380d8c4a export: Increase maximum policy version in exported files to 4.0
The files generated by `install(EXPORT)`, `export()`, and
`install_jar_exports()` commands are known to work with policies
as of CMake 4.0, so enable them in sufficiently new CMake versions.
2025-07-02 09:41:30 -04:00
Brad King
94ff184a63 Add deprecation warnings for policies CMP0143 and below
The OLD behaviors of all policies are deprecated, but only by
documentation.  Add an explicit deprecation diagnostic for policies
introduced in CMake 3.26 and below to encourage projects to port
away from setting policies to OLD.
2025-07-02 09:38:53 -04:00
Brad King
759c6fd6a1 curl: Restore configuration checks on UNIX platforms
In commit 0112a49bfa (curl: Set build options the way we need for CMake,
2025-06-04, v4.1.0-rc1~54^2) we enabled `_CURL_PREFILL` on many UNIX
platforms.  However, curl's default only enables prefill on Windows.

Fixes: #27045
2025-07-02 09:28:25 -04:00
Brad King
5071c93a78 GNUInstallDirs: Fix regression on -DCMAKE_INSTALL_<dir>=<default>
In commit 42dfcbf1a5 (GNUInstallDirs: Refactor LIBDIR default
calculation, 2025-03-27, v4.1.0-rc1~384^2~2) we introduced the
`_GNUInstallDirs_LIBDIR_get_default` helper and exercised code from
commit 9789f7d05e (GNUInstallDirs: Add internal helper to compute
specific defaults, 2025-03-28, v4.1.0-rc1~384^2~3) for the first time.
Fix the latter's code to update the `CMAKE_INSTALL_<dir>` cache entry
without triggering conversion of a relative path to an absolute path.

Fixes: #27027
2025-07-02 09:14:56 -04:00
Brad King
7c8e4687b9 ci: configure 'typos' to tolerate all 8-12 character hex identifiers
Previously we tolerated only 10 character hex identifiers as commit
references, but they are typically anywhere from 8 to 12 characters.
2025-07-02 08:36:06 -04:00
Brad King
0a385b880a Merge topic 'ctest-safe-build-id'
2aa2c9af97 ctest: Don't modify build and site names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10911
2025-07-02 08:03:33 -04:00
Brad King
71fb845adf Merge branch 'release-4.1' 2025-07-02 08:01:58 -04:00
Brad King
cbc3166ca4 Merge topic 'clang-cl-c23'
9a720d96eb clang-cl: Add support for C23

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !10916
2025-07-02 08:01:58 -04:00
Brad King
2e76b79d80 Merge topic 'clang-cl-c23' into release-4.1
9a720d96eb clang-cl: Add support for C23

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !10916
2025-07-02 08:01:55 -04:00
Brad King
22cfa268fb Merge branch 'release-4.1' 2025-07-02 08:00:40 -04:00