mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-20 06:48:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
72,524 Commits 2 Branches 401 Tags
8fcc347fe80351c529b7ad49edcd3aa13ca7fb13
Commit Graph

72524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 8fcc347fe8 Merge topic 'fbuild_fix_globbing' 
6fd6bfab6f FASTBuild: fix globbing for large projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: 风之凌殇 <fzls.zju@gmail.com>
Merge-request: !11310
 2025-10-16 08:55:05 -04:00
Kitware Robot 80953a8556 CMake Nightly Date Stamp 2025-10-16 00:05:12 -04:00
Eduard Voronkin 6fd6bfab6f FASTBuild: fix globbing for large projects 
FASTBuild will replace `%1%` with
all the glob matches, which might
exceed command line limit on Windows.
Moreover, we don't need to pass all the
matches to the VerifyGlobs.cmake script.

Fixes: #27305
 2025-10-15 09:17:41 -04:00
Brad King afa9e9d570 Merge topic 'usejava-modjar-improvements' 
343ee5b9ee UseJava: add INCLUDE_MODULES argument to add_jar
b3365e7c57 UseJava: extract function to prepare the classpath arguments in add_jar

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11280
 2025-10-15 09:12:24 -04:00
Brad King 44e3a2779c Merge branch 'release-4.2' 2025-10-15 09:10:00 -04:00
Brad King c6269305cd Merge topic 'fix-export-link-interfaces' 
b209c41dfa export(TARGETS): Restore EXPORT_LINK_INTERFACE_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11309
 2025-10-15 09:10:00 -04:00
Brad King b230eb2302 Merge topic 'fix-export-link-interfaces' into release-4.2 
b209c41dfa export(TARGETS): Restore EXPORT_LINK_INTERFACE_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11309
 2025-10-15 09:09:57 -04:00
Kitware Robot b29c700b47 CMake Nightly Date Stamp 2025-10-15 00:04:53 -04:00
Taylor Sasser b209c41dfa export(TARGETS): Restore EXPORT_LINK_INTERFACE_LIBRARIES 
Refactoring in commit 998495cb49 (cmExportCommand: Port to
cmSubcommandTable, 2025-07-15) accidentally removed support for the
`EXPORT_LINK_INTERFACE_LIBRARIES` argument.  Restore it with a test.

Fixes: #27302
 2025-10-14 13:03:22 -04:00
Brad King 90fdd91d4f Merge branch 'release-4.2' 2025-10-14 12:51:50 -04:00
Brad King 373d9db66f Merge topic 'install-export-error-on-empty' 
b9f3adb0a6 install(EXPORT): Fail earlier if EXPORT is missing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11301
 2025-10-14 12:51:49 -04:00
Brad King 85eb60b7ff Merge topic 'install-export-error-on-empty' into release-4.2 
b9f3adb0a6 install(EXPORT): Fail earlier if EXPORT is missing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11301
 2025-10-14 12:51:47 -04:00
Javier Martín 343ee5b9ee UseJava: add INCLUDE_MODULES argument to add_jar 
Arguments are added to the dependencies list, and to the "--module-path"
passed to javac, which is only generated for adequate JDK versions.
 2025-10-14 18:23:21 +02:00
Javier Martín b3365e7c57 UseJava: extract function to prepare the classpath arguments in add_jar 2025-10-14 18:10:54 +02:00
Matthew Woehlke b9f3adb0a6 install(EXPORT): Fail earlier if EXPORT is missing 
Add an explicit check in `install(EXPORT)` that the export name is
non-empty. Since an empty-named export set will never exist, this is
always an error. Previously, however, the error would not be caught
until generate time. Now an error will be produced immediately.
 2025-10-14 11:52:03 -04:00
Brad King 3031e3015e Merge topic 'patch-FindMatlab' 
1d57678146 FindMatlab: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11308
 2025-10-14 11:50:56 -04:00
Brad King 44edd3df3f Merge topic 'patch-CPackIFWConfigureFile' 
559bfd0bbd CPackIFWConfigureFile: Update documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11305
 2025-10-14 11:49:11 -04:00
Brad King 36e5e27425 Merge branch 'release-4.2' 2025-10-14 11:47:48 -04:00
Brad King 3bf400558d Merge topic 'patch-find-modules-missing-found-vars' 
c8ea0ba3be Find*: Add missing <PackageName>_FOUND variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11303
 2025-10-14 11:47:48 -04:00
Brad King caef2113e6 Merge topic 'patch-find-modules-missing-found-vars' into release-4.2 
c8ea0ba3be Find*: Add missing <PackageName>_FOUND variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11303
 2025-10-14 11:47:46 -04:00
Brad King 761aa02e4f Merge branch 'release-4.2' 2025-10-14 11:46:28 -04:00
Brad King 5e7fa8d624 Merge topic 'patch-FindLua-version-51' 
b4a08078d6 FindLua51: Use Lua51_VERSION result variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11306
 2025-10-14 11:46:27 -04:00
Brad King 6843f4b62a Merge topic 'patch-FindLua-version-51' into release-4.2 
b4a08078d6 FindLua51: Use Lua51_VERSION result variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11306
 2025-10-14 11:46:25 -04:00
Brad King 02d0ebb76e Merge branch 'release-4.2' 2025-10-14 11:44:43 -04:00
Brad King 52cf9fc48f Merge topic 'patch-FindOpenMP' 
e5aa17333d FindOpenMP: Set the version result variable and update docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11304
 2025-10-14 11:44:42 -04:00
Brad King 1b9dbb6c90 Merge topic 'patch-FindOpenMP' into release-4.2 
e5aa17333d FindOpenMP: Set the version result variable and update docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11304
 2025-10-14 11:44:40 -04:00
Brad King 1a76df1fd9 Merge branch 'release-4.2' 2025-10-14 11:43:28 -04:00
Brad King 32ee984b60 Merge topic 'find_cuda_toolkit_run_nvcc_with_ccbin' 
4c3480fc0a CUDAToolkit: Use correct target paths from nvcc when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11228
 2025-10-14 11:43:28 -04:00
Brad King 0279505105 Merge topic 'find_cuda_toolkit_run_nvcc_with_ccbin' into release-4.2 
4c3480fc0a CUDAToolkit: Use correct target paths from nvcc when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11228
 2025-10-14 11:43:25 -04:00
Brad King 20b53ddd24 Merge branch 'release-4.2' 2025-10-14 11:40:41 -04:00
Brad King 623e1b6c62 Merge topic 'external-project-env-mod-lists' 
9cb590b843 ExternalProject: Fix lists and empty commands with environment modification
2e0a8455b3 Tests: Match expected environment modification more completely
819c6177b8 Tests: Match expected environment modification more consistently
c555e10fd4 Tests: Use shorter paths in RunCMake.ExternalProject

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11272
 2025-10-14 11:40:40 -04:00
Brad King 6b57a8435f Merge topic 'external-project-env-mod-lists' into release-4.2 
9cb590b843 ExternalProject: Fix lists and empty commands with environment modification
2e0a8455b3 Tests: Match expected environment modification more completely
819c6177b8 Tests: Match expected environment modification more consistently
c555e10fd4 Tests: Use shorter paths in RunCMake.ExternalProject

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11272
 2025-10-14 11:40:33 -04:00
Kitware Robot 3b648d3d99 CMake Nightly Date Stamp 2025-10-14 00:04:19 -04:00
Peter Kokot 559bfd0bbd CPackIFWConfigureFile: Update documentation 
- Extended command description.
- Added basic "Examples" section.
- Added "See Also" section.
 2025-10-13 12:12:45 -04:00
Peter Kokot b4a08078d6 FindLua51: Use Lua51_VERSION result variable 
If using both FindLua and FindLua51 modules, the FindLua51 and Lua 5.2
or newer is found, FindLua51 module can set the Lua_VERSION variable to
empty value. Instead, the Lua51_VERSION can be used to bypass this
issue.

Issue: #27088
 2025-10-13 12:10:24 -04:00
Peter Kokot e5aa17333d FindOpenMP: Set the version result variable and update docs 
* This module previously didn't define the OpenMP_VERSION result
  variable.
* Added CMake versions to variables when they were provided by the
  module.
* Synced docs.
 2025-10-13 12:09:54 -04:00
Peter Kokot c8ea0ba3be Find*: Add missing <PackageName>_FOUND variables 
* FindKDE4: Added note about KDE4_FOUND result variable (it is set by
  the upstream FindKDE4Internal module, and now also synced in the docs
  and code for consistency).

For the sake of completeness with other find modules, also the following
deprecated find modules are synced as they already provided these
variables:

* FindDart: Documented the Dart_FOUND result variable.
* FindUnixCommands: Updated documentation (documented UnixCommands_FOUND
  result variable, and listed cache variables used by this module).

Issue: #27242
 2025-10-13 12:06:58 -04:00
Peter Kokot 1d57678146 FindMatlab: Update documentation 
- Moved all documentation to the top header comment to make it easier to
  manage and adjust.
- Synced module documentation with other similar find modules.
- Restructured the module docs and titles.
- Added missing "versionadded" RST directives.
- Used "command" instead of "function".
- Added examples section.
- Removed redundant variable references.
 2025-10-13 17:54:16 +02:00
Robert Maynard 4c3480fc0a CUDAToolkit: Use correct target paths from nvcc when cross-compiling 
This fixes issues where FindCUDAToolkit would find host
host platform libraries when nvcc -ccbin pointed to compiler of
a different CPU architecture.
 2025-10-13 11:04:10 -04:00
Evan Wilde 9cb590b843 ExternalProject: Fix lists and empty commands with environment modification 
Fix two bugs from commit e301cbffcc (ExternalProject: Set environment
variables, 2025-04-09):

* Do not flatten lists in command arguments when adding env mods.

* Remove empty `COMMAND`s without injecting corresponding env mods.

Fixes: #27125
Fixes: #27126
Co-authored-by: Brad King <brad.king@kitware.com>
 2025-10-13 10:28:17 -04:00
Brad King a959ea79e8 Merge branch 'release-4.2' 2025-10-13 10:21:01 -04:00
Brad King dfbcc00131 Merge topic 'cuda-msvc-defines' 
948b2fe31a CMP0204: Remove redundant cases from RunCMake.MsvcCharsetDefines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11307
 2025-10-13 10:21:00 -04:00
Brad King da592d67b1 Merge topic 'cuda-msvc-defines' into release-4.2 
948b2fe31a CMP0204: Remove redundant cases from RunCMake.MsvcCharsetDefines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11307
 2025-10-13 10:20:54 -04:00
Kitware Robot c9ffe0b9a1 CMake Nightly Date Stamp 2025-10-13 00:04:44 -04:00
Brad King 948b2fe31a CMP0204: Remove redundant cases from RunCMake.MsvcCharsetDefines 
A single executable for each policy/charset combination is sufficient.
The behavior is the same across target types.

The "OLD" cases are not needed because "WARN" has the same behavior.

The `-D` cases are not needed because `target_compile_definitions`
strips the `-D` prefix before populating `COMPILE_DEFINITIONS`.
 2025-10-12 11:11:41 -04:00
Brad King 2e0a8455b3 Tests: Match expected environment modification more completely 2025-10-12 10:33:52 -04:00
Brad King 819c6177b8 Tests: Match expected environment modification more consistently 
Revert the regex change from commit 01147454e7 (FASTBuild: Add
generator, 2025-07-30) and revise the build output to match anyway.
The actual problem was that build and install steps are driven through
a nested `cmake --build`, and `fbuild` prefixes the first line of build
output.  Add an innocuous first line so we can match the intended lines
consistently across generators.
 2025-10-12 10:33:14 -04:00
Brad King a887b33a5d Merge branch 'release-4.2' 2025-10-12 09:20:21 -04:00
Brad King 8183c6a9ba Merge topic 'fix-copy-on-error-directory-info' 
657e9be724 file(CREATE_LINK): Document `COPY_ON_ERROR` behavior on directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11299
 2025-10-12 09:20:20 -04:00
Brad King 7095118a78 Merge topic 'fix-copy-on-error-directory-info' into release-4.2 
657e9be724 file(CREATE_LINK): Document `COPY_ON_ERROR` behavior on directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11299
 2025-10-12 09:20:18 -04:00