mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 05:39:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
72,064 Commits 2 Branches 401 Tags
b62e75136931e8a7769aef7e16faaf69597789b2
Commit Graph

72064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King b62e751369 Merge topic 'patch-FindGit-version' 
fe72a5dba2 FindGit: Add Git_VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11191
 2025-09-17 10:04:31 -04:00
Kitware Robot 5536171cf3 CMake Nightly Date Stamp 2025-09-17 00:05:18 -04:00
Brad King 5e206e15c5 Merge topic 'fbuild_reduce_aliases' 
4387c965a6 FASTBuild: optimize generated file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11193
 2025-09-16 09:56:55 -04:00
Brad King 690ed2f706 Merge topic 'patch-CMakeConfigurableFile' 
92c808687d Modules: Use file(CONFIGURE) instead of CMakeConfigurableFile.in

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11188
 2025-09-16 09:55:23 -04:00
Brad King 4ae24357ad Merge topic 'patch-CMakeDependentOption-script-mode' 
8b25e11fed CMakeDependentOption: Document project and script mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11192
 2025-09-16 09:53:39 -04:00
Brad King ae0f7f8498 Merge topic 'findwxwidgets' 
96f6382357 FindwxWidgets: updates for wxWidgets 3.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vadim Zeitlin <vz-kitware@zeitlins.org>
Merge-request: !11190
 2025-09-16 09:51:52 -04:00
Brad King a66c325ec1 Merge topic 'patch-FindImageMagick-version' 
032e829b23 FindImageMagick: Add ImageMagick_VERSION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11187
 2025-09-16 09:50:27 -04:00
Brad King 592297dbea Merge topic 'fix_typo_in_tests' 
899172109a Tests: Fix RunCMake.CMakePresetsBuild failure message order

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11181
 2025-09-16 09:48:44 -04:00
Brad King c4fe74ba3d Merge topic 'python-android-link' 
1507491c25 FindPython: link modules against libpython on Android

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11153
 2025-09-16 09:16:35 -04:00
Brad King c325904eb1 Merge topic 'vs2026' 
47c784ba8a Help: Add release note for Visual Studio 18 2026 generator
cd46d8ec84 Merge branch 'backport-vs2026' into vs2026
3392b371e2 VS: Add Visual Studio 18 2026 generator
7f0883ac04 VS: Remove unused generator code
6f0d245083 VS: Fix `/dynamicdeopt` flag table entry order for v145 toolset
398ce8af72 VS: Remove `/guard:cf` from v145 link flag table
5c9085d876 VS: Remove `/MERGE` from v145 link flag table
fe5c78310c VS: Map the link `/debug` flag for v145 toolset
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11168
 2025-09-16 09:00:10 -04:00
Brad King 4251e9381d Merge branch 'release-4.1' 2025-09-16 08:50:44 -04:00
Brad King 1bdf6d2db6 Merge topic 'lfortran-0.55' 
3b85cc1a8e Tests: Extend RunCMake.ParseImplicitLinkInfo for LFortran 0.55.0
7e8f76dad2 LFortran: Update flags renamed by version 0.55

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11184
 2025-09-16 08:50:44 -04:00
Brad King 3b95dadd08 Merge topic 'lfortran-0.55' into release-4.1 
3b85cc1a8e Tests: Extend RunCMake.ParseImplicitLinkInfo for LFortran 0.55.0
7e8f76dad2 LFortran: Update flags renamed by version 0.55

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11184
 2025-09-16 08:50:40 -04:00
Kitware Robot 7043a42757 CMake Nightly Date Stamp 2025-09-16 00:05:23 -04:00
Brad King 3b85cc1a8e Tests: Extend RunCMake.ParseImplicitLinkInfo for LFortran 0.55.0 2025-09-15 20:34:16 -04:00
Christopher Albert 7e8f76dad2 LFortran: Update flags renamed by version 0.55 
The `--generate-object-code` flag is now `--separate-compilation`.

Fixes: #27225
 2025-09-15 20:34:16 -04:00
Eduard Voronkin 899172109a Tests: Fix RunCMake.CMakePresetsBuild failure message order 
The actual and expected content were switched.
 2025-09-15 17:05:20 -04:00
Brad King 9a53a28596 Merge topic 'improve-diagnostic' 
ca072e3734 cmListFileLexer: Test for broken UTF-32-(BE|LE) BOM
3b8ddf3f45 cmListFileLexer: Handle null character in the grammar
7040406f86 cmListFileLexer: Do not require null-terminated input
0a26c08004 cm/string_view: Prevent find access past string end
63328f01f8 Utilities/Scripts: Drop CommandArgument lexer/parser generation step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11173
 2025-09-15 11:42:12 -04:00
Brad King 2337bfc562 Merge topic 'cxxmodules-custom-import-std-metadata-file' 
85e536b5eb gitlab-ci: test `CMAKE_CXX_STDLIB_MODULES_JSON` in CI
42621a232b Tests/CXXModules: add a label
2f101b2c8c Tests/CXXModules: support testing with custom stdlib json locations
6c178a4ae3 Tests/RunCMake: add newlines in CXXModules options
2b85541e39 cxximportstd: support setting the `import std` metadata location

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11175
 2025-09-15 11:39:52 -04:00
Brad King 0355497103 Merge topic 'intermediate-dir-strategy-mark-usage' 
9ad31a0d88 cmGlobalGenerator: mark intermediate directory strategy variables as used

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11178
 2025-09-15 11:37:47 -04:00
Brad King 47c784ba8a Help: Add release note for Visual Studio 18 2026 generator 2025-09-15 11:34:07 -04:00
Brad King cd46d8ec84 Merge branch 'backport-vs2026' into vs2026 2025-09-15 11:33:57 -04:00
Brad King 3392b371e2 VS: Add Visual Studio 18 2026 generator 
Closes: #27213
 2025-09-15 11:31:02 -04:00
Kitware Robot d148703375 CMake Nightly Date Stamp 2025-09-15 00:05:31 -04:00
Eduard Voronkin 4387c965a6 FASTBuild: optimize generated file 
List of changes:
1. Remove unneeded aliases
2. Don't write VS Solution on Apple
3. Use external script to perform clean
4. Fix small bug when empty environment was
resulting in invalid file.
It greatly reduces the size of .fdb file and
makes FASTBuild run much faster in different cases.
 2025-09-14 20:26:11 -07:00
Craig Scott 0f0b9dde66 Merge topic 'patch-ExternalProject-include' 
395452ad1d ExternalProject: Document module inclusion in project mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11177
 2025-09-14 22:57:46 -04:00
Peter Kokot 8b25e11fed CMakeDependentOption: Document project and script mode 
This module also works in script mode. This is a sync with the option()
command which mentions how the variable behaves in project and script
mode.
 2025-09-14 23:38:51 +02:00
Peter Kokot fe72a5dba2 FindGit: Add Git_VERSION 
This deprecates the GIT_VERSION_STRING result variable.

Issue: #27088
Fixes: #26868
 2025-09-14 21:08:16 +02:00
Maarten Bent 96f6382357 FindwxWidgets: updates for wxWidgets 3.3 
wxWidgets 3.3 changed some win32 libraries from dynamic to static loading.
Update the list of win32 libraries to the list used upstream.
wsock32 is not used in wxWidgets 3.3 anymore, but keep it for older wxWidgets versions.

wxWidgets 3.3 also adds the wxwebp library. Add it, and its sub-libraries, to wxWidgets_COMMON_LIBRARIES.
 2025-09-14 17:52:58 +02:00
Kitware Robot dd06fad849 CMake Nightly Date Stamp 2025-09-14 00:05:12 -04:00
Peter Kokot 92c808687d Modules: Use file(CONFIGURE) instead of CMakeConfigurableFile.in 
When this was implemented, file(CONFIGURE) wasn't yet available until
CMake 3.18.
 2025-09-14 00:56:19 +02:00
Peter Kokot 032e829b23 FindImageMagick: Add ImageMagick_VERSION 
This deprecates the ImageMagick_VERSION_STRING result variable.

Additionally, ImageMagick version is now determined by either mogrify
executable (if available), or from the `<magick/version.h>` header.

Issue: #27088
 2025-09-13 23:48:05 +02:00
Malcolm Smith 1507491c25 FindPython: link modules against libpython on Android 2025-09-13 12:53:18 +01:00
Kitware Robot b53375ea94 CMake Nightly Date Stamp 2025-09-13 00:05:12 -04:00
Ben Boeckel 9ad31a0d88 cmGlobalGenerator: mark intermediate directory strategy variables as used 
Fixes: #27222
 2025-09-12 13:59:22 -04:00
Sergiu Deitsch ca072e3734 cmListFileLexer: Test for broken UTF-32-(BE|LE) BOM 2025-09-12 18:28:55 +02:00
Sergiu Deitsch 3b8ddf3f45 cmListFileLexer: Handle null character in the grammar 2025-09-12 18:28:55 +02:00
Sergiu Deitsch 7040406f86 cmListFileLexer: Do not require null-terminated input 2025-09-12 18:28:55 +02:00
Brad King d5d02f80c0 Merge topic 'msvc-flags-fix-for-27177' 
9851ddfc11 VS: Check all default suppressed MSBuild flags
7202539fd4 VS: Suppress MSBuild default flags not specified by project or user

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11165
 2025-09-12 11:43:16 -04:00
Brad King fa3387a64f Merge topic 'fbuild_cache_path' 
f77628e0af FASTBuild: don't set default cache path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11157
 2025-09-12 11:40:40 -04:00
Brad King 434546f710 Merge topic 'typo' 
1f99ea95d3 Help: Fix typo in INSTALL_PARALLEL documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Martin Duffy <martin.duffy@kitware.com>
Merge-request: !11170
 2025-09-12 11:38:22 -04:00
Brad King 82405b106c Merge topic 'fbuild_fix_typo' 
3027c24057 FASTBuild: fix a small typo in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11174
 2025-09-12 11:33:01 -04:00
Brad King 0275e7a65f Merge topic 'doc-matches' 
2adfa8b0d4 Help: Fix version added for `CMAKE_MATCH_<n>`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11171
 2025-09-12 11:31:01 -04:00
Brad King 064df8a511 Merge topic 'wix-empty-components' 
6e3f6e925d CPack/WiX: Allow multiple empty top-level components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11172
 2025-09-12 11:28:17 -04:00
Kitware Robot e990e60dd9 CMake Nightly Date Stamp 2025-09-12 00:05:09 -04:00
Ben Boeckel 85e536b5eb gitlab-ci: test CMAKE_CXX_STDLIB_MODULES_JSON in CI 
Do this by relocating the file to a sibling directory so that its `../`
contents continue to find the correct module interface files, but it
won't be found by default.
 2025-09-11 23:42:31 -04:00
Peter Kokot 395452ad1d ExternalProject: Document module inclusion in project mode 
This module can be only included in project mode (when `CMAKE_ROLE` is
`PROJECT`).

Issue: #26555
 2025-09-12 03:38:42 +02:00
Ben Boeckel 42621a232b Tests/CXXModules: add a label 
So that CI can target the test where necessary.
 2025-09-11 18:05:27 -04:00
Ben Boeckel 2f101b2c8c Tests/CXXModules: support testing with custom stdlib json locations 2025-09-11 18:03:05 -04:00
Ben Boeckel 6c178a4ae3 Tests/RunCMake: add newlines in CXXModules options 
Better readability for upcoming changes.
 2025-09-11 18:03:05 -04:00