mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 09:59:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
71,995 Commits 2 Branches 401 Tags
b53375ea942765cd54dc35c9b3407c1eb2faba33
Commit Graph

71995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot b53375ea94 CMake Nightly Date Stamp 2025-09-13 00:05:12 -04: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
Eduard Voronkin f77628e0af FASTBuild: don't set default cache path 
Leave only 2 option to set cache path:
1. CMake variable
2. Environment variable
Update docs to reflect the changes.
 2025-09-11 11:25:36 -07:00
Alexander Grund 2adfa8b0d4 Help: Fix version added for CMAKE_MATCH_<n> 
This was added in 2.6.0 by commit c1b3484c2d (ENH: store the matches for
paren-delimited subexpression..., 2007-08-21, v2.6.0~1227), not in 3.9.

Only the documentation at this place was added in 3.9, by commit
eb08e1febb (Help: Document CMAKE_MATCH_<n> variables, 2017-04-18,
v3.9.0-rc1~257^2)
 2025-09-11 13:09:18 -04:00
Brad King d1541ee77e Merge branch 'release-4.1' 2025-09-11 13:05:46 -04:00
Brad King 31fd368e80 Merge topic 'GNUInstallDirs-cached-default' into release-4.1 
2e88a3efc2 GNUInstallDirs: Fix regression on -DCMAKE_INSTALL_<dir>=<default> in /usr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11167
 2025-09-11 13:05:19 -04:00
Eduard Voronkin 3027c24057 FASTBuild: fix a small typo in documentation 2025-09-11 09:58:33 -07:00
Brad King ea539e2de6 Merge topic 'GNUInstallDirs-cached-default' 
2e88a3efc2 GNUInstallDirs: Fix regression on -DCMAKE_INSTALL_<dir>=<default> in /usr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11167
 2025-09-11 12:06:59 -04:00
Brad King 568e3318bc Merge topic 'wix-multi-cab' 
193f17102f CPack/WiX: Implement opt-in per component .cab

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11166
 2025-09-11 12:04:27 -04:00
Brad King d1f17a6b7c Merge topic 'update-curl' 
8145958e01 Merge branch 'upstream-curl' into update-curl
20103c0679 curl 2025-09-10 (11b99123)
dbb84e50b1 curl: Update script to get curl 8.16.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11169
 2025-09-11 11:39:31 -04:00
Nils Gladitz 6e3f6e925d CPack/WiX: Allow multiple empty top-level components 
Avoid generating empty / conflicting directory components for
the installation root which is shared across components and
(except for the degenerate case of an empty installer)
will always be created implicitly.
 2025-09-11 15:18:50 +02:00
AJIOB 9851ddfc11 VS: Check all default suppressed MSBuild flags 2025-09-11 13:59:19 +03:00
AJIOB 7202539fd4 VS: Suppress MSBuild default flags not specified by project or user 2025-09-11 13:59:19 +03:00
Nils Gladitz 1f99ea95d3 Help: Fix typo in INSTALL_PARALLEL documentation 2025-09-11 12:30:31 +02:00
Kitware Robot 50e5040cda CMake Nightly Date Stamp 2025-09-11 00:05:14 -04:00
Brad King 8145958e01 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2025-09-10 (11b99123)
 2025-09-10 17:13:04 -04:00
Curl Upstream 20103c0679 curl 2025-09-10 (11b99123) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 11b991232fbcaa88e2b1faecac224416b0001e35 (curl-8_16_0).
 2025-09-10 17:07:26 -04:00
Brad King dbb84e50b1 curl: Update script to get curl 8.16.0 2025-09-10 17:07:14 -04:00
Cristian Le 2e88a3efc2 GNUInstallDirs: Fix regression on -DCMAKE_INSTALL_<dir>=<default> in /usr 
Fix commit 9789f7d05e (GNUInstallDirs: Add internal helper to compute
specific defaults, 2025-03-28, v4.1.0-rc1~384^2~3) to avoid updating
explicitly-specified cache entries on the first run.  Do not reset the
default value until at least the second run, during which we have
`_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX` already defined.

Fixes: #27211
 2025-09-10 16:03:43 -04:00
Brad King 29633b2f81 Merge topic 'ninja-status-unset-configure' 
b5e06311c0 Ninja: Avoid non-standard output from `ninja` during `try_compile`
fe0e2fcaff ScopedEnv: add a RAII helper to temporarily manipulate the environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !11143
 2025-09-10 10:06:49 -04:00
Brad King 042b88e3f4 Merge topic 'object-name-properties' 
b53837a1bd prop_sf/INSTALL_OBJECT_NAME: support custom install object names
08f1a0fbc6 cmLocalGenerator: get the configuration when building object paths
168e55be41 cmObjectLocation: support install-specific object locations
84372ce0b5 prop_sf/OBJECT_NAME: no-op for the FASTBuild and Xcode generators
9ef99353cb prop_sf/OBJECT_NAME: support custom object names
7aff0d37b5 cmSourceFile: add accessors for PCH source files
bbdc2fd908 cmSourceFile: internally track CMake-managed source files
388923818d cmGeneratorTarget: return the source file added
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11144
 2025-09-10 10:01:47 -04:00
Brad King b768431138 Merge topic 'instrumentation-doc-format' 
515be042e2 Help/instrumentation: Improve formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11163
 2025-09-10 09:56:04 -04:00
Brad King e0a9bbfc23 Merge topic 'target-SKIP_LINTING' 
f100769d72 Add `SKIP_LINTING` target property and `CMAKE_SKIP_LINTING` variable
0d6b5d54b2 Tests/RunCMake/MultiLint: Extract test preparation code into separate file
3a21092d75 Tests/RunCMake/MultiLint: Refactor test runs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11139
 2025-09-10 09:53:48 -04:00
Nils Gladitz 193f17102f CPack/WiX: Implement opt-in per component .cab 
By setting CPACK_WIX_CAB_PER_COMPONENT users can generate one
.cab per component instead of one .cab per installer.

WiX compresses .cab files in parallel.
This may potentially speed up installer creation.

May also allow larger installers (there is a 2GB per .cab limit).
 2025-09-10 12:24:42 +02:00
Kitware Robot 082071203f CMake Nightly Date Stamp 2025-09-10 00:05:08 -04:00
Ben Boeckel b53837a1bd prop_sf/INSTALL_OBJECT_NAME: support custom install object names 
These can support configuration-dependent queries much more easily, so
separate it out.
 2025-09-09 09:58:07 -04:00
Ben Boeckel 08f1a0fbc6 cmLocalGenerator: get the configuration when building object paths 
Install locations can be per-configuration, so this information is
necessary for this call. Plumb it through; usage will follow in the next
commit.
 2025-09-09 09:58:07 -04:00
Ben Boeckel 168e55be41 cmObjectLocation: support install-specific object locations 
This will be used to implement custom install object paths. These can
support per-configuration values much more easily as it is
generator-agnostic.
 2025-09-09 09:58:07 -04:00
Ben Boeckel 84372ce0b5 prop_sf/OBJECT_NAME: no-op for the FASTBuild and Xcode generators 
There's no control over the object base name implemented in the
FASTBuild generator. Rather than expecting some half-supported behavior,
just ignore it completely there.

Similarly, Xcode ends up making its own object paths internally
regardless of what CMake would like.
 2025-09-09 09:58:07 -04:00
Ben Boeckel 9ef99353cb prop_sf/OBJECT_NAME: support custom object names 
Projects which ship object files as artifacts may want to control the
object names as much as possible. Support setting explicit object names
as source file properties to support such use cases.
 2025-09-09 09:58:07 -04:00
Alex Turbov f100769d72 Add SKIP_LINTING target property and CMAKE_SKIP_LINTING variable 
These offer target-wide settings to disable lints.

Closes: #27191
 2025-09-09 09:56:35 -04:00
Brad King 563e11b6fd Merge topic 'cmake#27203/add-NDEBUG-GHS' 
7493bc6d4a GHS C/CXX compiler: add NDEBUG compile define for non-debug aka release builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11158
 2025-09-09 09:53:10 -04:00
Brad King 526b32ccc0 Merge topic 'c++23-ambiguous-overload' 
9fac84dd7f cmStringAlgorithms: Fix C++23 ambiguous overload error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11155
 2025-09-09 09:50:50 -04:00
Brad King c81e96d80c Merge topic 'CheckCompilerFlag-no-newlines' 
993794f5f6 CheckCompilerFlag: Avoid matching parts of multiple messages
c196e024bd CheckCompilerFlag: Improve layout of message regex tables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11161
 2025-09-09 09:48:37 -04:00
Brad King 990301452b Merge branch 'release-4.1' 2025-09-09 09:45:35 -04:00
Brad King f32b6ae8f2 Merge topic 'iar-asm' 
87d95b2222 ASM: Restore CMAKE_ASM_COMPILER_ARCHITECTURE_ID persistence

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11160
 2025-09-09 09:45:34 -04:00
Brad King 9523d66df2 Merge topic 'iar-asm' into release-4.1 
87d95b2222 ASM: Restore CMAKE_ASM_COMPILER_ARCHITECTURE_ID persistence

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11160
 2025-09-09 09:45:32 -04:00
Brad King 517214ed9b Merge topic 'typos-1.36.1' 
8fb6449275 ci: Update to typos 1.36.1 in Fedora base image
49e05f9569 pre-commit: bump to typos 1.36.1
20e19a713d Source: Fix typo discovered by typos 1.36.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11150
 2025-09-09 09:43:31 -04:00
Kitware Robot ea2069bf9d CMake Nightly Date Stamp 2025-09-09 00:05:11 -04:00
John Drouhard b5e06311c0 Ninja: Avoid non-standard output from ninja during try_compile 
We sometimes parse the output from `ninja` during `try_compile`. Avoid
unexpected characters.

Fixes: #19316
 2025-09-08 16:22:58 -05:00
John Drouhard fe0e2fcaff ScopedEnv: add a RAII helper to temporarily manipulate the environment 2025-09-08 16:22:58 -05:00
Brad King f2b9c01d0c Merge branch 'release-4.1' 2025-09-08 15:57:42 -04:00
Brad King f8608b020b Merge branch 'release-4.0' 2025-09-08 15:57:28 -04:00
Tyler Yankee 515be042e2 Help/instrumentation: Improve formatting 
* Fix bullet points from commit bf52fbfbc4 (instrumentation: Add Google
trace output, 2025-08-28).
* Pluralize "v1 Snippet File" where applicable.
* Wrap long lines to <80 chars where applicable.
 2025-09-08 15:57:18 -04:00