mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-25 16:09:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
73,068 Commits 2 Branches 386 Tags
4e85f9078d01be7e79855175b36af8fd026a42df
Commit Graph

73068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
4e85f9078d Merge topic 'vs-slnx' 
70ed720232 VS: Add SLNX default startup project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11420
 2025-11-15 09:01:50 -05:00
Brad King
9b6a737f99 Merge branch 'release-4.2' 2025-11-15 08:59:05 -05:00
Brad King
b4c8e00f9f Merge topic 'fbuild_fix_pch' 
878d154322 FASTBuild: fix multi-language PCHs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11404
 2025-11-15 08:59:05 -05:00
Brad King
9e38d74019 Merge topic 'fbuild_fix_pch' into release-4.2 
878d154322 FASTBuild: fix multi-language PCHs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11404
 2025-11-15 08:59:03 -05:00
Kitware Robot
dea6b14379 CMake Nightly Date Stamp 2025-11-15 00:07:41 -05:00
Brad King
70ed720232 VS: Add SLNX default startup project 
At the time of commit e6aa7742b0 (VS: Generate .slnx files for VS 2026,
2025-09-17, v4.2.0-rc1~151^2), the VS 18 Insiders edition did not offer
support for specifying a default startup project in `.slnx` files.
This has since been added, so use it.

Fixes: #27387
 2025-11-14 11:03:57 -05:00
Brad King
34b7e7ac64 Merge branch 'release-4.2' 2025-11-14 09:49:19 -05:00
Brad King
a5328ab279 Merge topic 'doc-typos-cleanup-4.2' 
730cad9cb6 Help: Fix typos and formatting for 4.2 release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11418
 2025-11-14 09:49:18 -05:00
Brad King
64a9839c25 Merge topic 'doc-typos-cleanup-4.2' into release-4.2 
730cad9cb6 Help: Fix typos and formatting for 4.2 release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11418
 2025-11-14 09:49:17 -05:00
Brad King
7d9eb75289 Merge branch 'release-4.2' 2025-11-14 09:46:33 -05:00
Brad King
3566a30938 Merge topic 'vs-slnx' 
7c284f4278 VS: Fix SLNX with multiple solution-to-project configuration mappings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11415
 2025-11-14 09:46:33 -05:00
Brad King
ef89890a1a Merge topic 'vs-slnx' into release-4.2 
7c284f4278 VS: Fix SLNX with multiple solution-to-project configuration mappings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11415
 2025-11-14 09:46:31 -05:00
Brad King
8d550834bd Merge branch 'release-4.2' 2025-11-14 09:40:58 -05:00
Brad King
a799c49454 Merge topic 'clang-analyzer' 
742c70a5da autogen: Remove unnecessary nullptr check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11414
 2025-11-14 09:40:58 -05:00
Brad King
ea722c9b0b Merge topic 'clang-analyzer' into release-4.2 
742c70a5da autogen: Remove unnecessary nullptr check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11414
 2025-11-14 09:40:56 -05:00
Brad King
5a89ce15d9 Merge branch 'release-4.2' 2025-11-14 09:39:09 -05:00
Brad King
c04b38f6dc Merge branch 'release-4.1' 2025-11-14 09:39:06 -05:00
Brad King
e58e1fb480 Merge branch 'release-4.0' 2025-11-14 09:39:03 -05:00
Brad King
dd9b736f5e Merge branch 'release-3.31' 2025-11-14 09:38:59 -05:00
Brad King
530cc99c11 Merge branch 'release-4.1' into release-4.2 2025-11-14 09:38:36 -05:00
Brad King
e0b2fce4cb Merge branch 'release-4.2' 2025-11-14 09:35:27 -05:00
Brad King
45b30d230f Merge topic 'ci-xcode-26.1' 
cf10b47e57 ci: update macOS jobs to use Xcode 26.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11416
 2025-11-14 09:35:27 -05:00
Brad King
15f30a43b7 Merge topic 'ci-xcode-26.1' into release-4.2 
cf10b47e57 ci: update macOS jobs to use Xcode 26.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11416
 2025-11-14 09:35:25 -05:00
Brad King
50380f1bc1 Merge branch 'release-4.0' into release-4.1 2025-11-14 09:31:27 -05:00
Brad King
14f0d086f7 Merge topic 'ci-xcode-26.1' into release-4.1 
cf10b47e57 ci: update macOS jobs to use Xcode 26.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11416
 2025-11-14 09:31:13 -05:00
Brad King
e5bf8a6324 Merge branch 'release-3.31' into release-4.0 2025-11-14 09:30:53 -05:00
Brad King
16ffc77177 Merge topic 'ci-xcode-26.1' into release-4.0 
cf10b47e57 ci: update macOS jobs to use Xcode 26.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11416
 2025-11-14 09:30:44 -05:00
Brad King
04d8da5f19 Merge topic 'ci-xcode-26.1' into release-3.31 
cf10b47e57 ci: update macOS jobs to use Xcode 26.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11416
 2025-11-14 09:29:17 -05:00
Craig Scott
730cad9cb6 Help: Fix typos and formatting for 4.2 release 2025-11-14 16:29:51 +11:00
Kitware Robot
a424a6987f CMake Nightly Date Stamp 2025-11-14 00:06:12 -05:00
Brad King
cf10b47e57 ci: update macOS jobs to use Xcode 26.1 2025-11-13 13:55:08 -05:00
Brad King
7c284f4278 VS: Fix SLNX with multiple solution-to-project configuration mappings 
Filter each mapping to apply only to its intended solution-wide config.

Fixes: #27385
 2025-11-13 12:01:51 -05:00
Eduard Voronkin
878d154322 FASTBuild: fix multi-language PCHs 
Fixes: #27371
 2025-11-13 10:00:33 -05:00
Brad King
742c70a5da autogen: Remove unnecessary nullptr check 
In commit b1b3602cda (FASTBuild: remove non-existent autogen byproducts,
2025-11-10) we added an unnecessary nullptr check on a pointer we know
to be non-nullptr.  Since then, `clang-analyzer` takes that check as a
hint that the pointer might be nullptr, and has reported missing nullptr
checks elsewhere.
 2025-11-13 09:46:18 -05:00
Brad King
22e4e7448f Merge topic 'genex' 
5ae8584a50 Help: Add an example showing -I's value to be a separate argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11407
 2025-11-13 08:20:55 -05:00
Brad King
e8d79658ef Merge branch 'release-4.2' 2025-11-13 08:19:26 -05:00
Brad King
d6b5c3cd90 Merge topic 'vs2026' 
53a7f5b702 Help: Update 4.2 release note for Visual Studio 18.0 release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11413
 2025-11-13 08:19:26 -05:00
Brad King
39d4fc2bb4 Merge topic 'vs2026' into release-4.2 
53a7f5b702 Help: Update 4.2 release note for Visual Studio 18.0 release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11413
 2025-11-13 08:19:24 -05:00
Brad King
dc74d01d6a Merge branch 'release-4.2' 2025-11-13 08:18:06 -05:00
Brad King
abb54f0cca Merge topic 'vs-cuda-keep' 
47d3a9b2da VS: Add CUDA flag table entry for nvcc --keep flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11411
 2025-11-13 08:18:06 -05:00
Brad King
5e99e170a7 Merge topic 'vs-cuda-keep' into release-4.2 
47d3a9b2da VS: Add CUDA flag table entry for nvcc --keep flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11411
 2025-11-13 08:18:04 -05:00
Brad King
2b12992dba Merge branch 'release-4.2' 2025-11-13 08:16:15 -05:00
Brad King
733a92c943 Merge topic 'ci-debian-13' 
322bf67a86 Merge branch 'backport-ci-debian-13' into ci-debian-13
8832f78dd6 IWYU: Update for Debian 13 CI job
f49b0e6759 IWYU: Update for Debian 13 CI job
3653b3e95e Merge branch 'backport-ci-debian-13' into ci-debian-13
1445a8e7db ci: use Debian 13 images and environments
9eedf6c1a9 ci: Update base images to Debian 13
36bdb7b2de ci: Update to TIClang 4.0.4
48f091a166 ci: Update debian12-ninja job to use Swift 6.2.1
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11412
 2025-11-13 08:16:15 -05:00
Brad King
c4acfcebbf Merge topic 'ci-debian-13' into release-4.2 
f49b0e6759 IWYU: Update for Debian 13 CI job
1445a8e7db ci: use Debian 13 images and environments
9eedf6c1a9 ci: Update base images to Debian 13
36bdb7b2de ci: Update to TIClang 4.0.4
48f091a166 ci: Update debian12-ninja job to use Swift 6.2.1
388e2ae0a5 FindPostgreSQL: Add support for version 17
a0642acbce FindImageMagick: Fix detection of version 7 from headers
faf8addc71 FindJNI: Add Debian/Ubuntu specific paths for more recent JDK versions
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11412
 2025-11-13 08:16:13 -05:00
Brad King
02bf95acfe Merge topic 'cmake-gui-reset-model' 
327f50083b cmake-gui: Fix {begin|end}ResetModel warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11406
 2025-11-13 08:11:48 -05:00
Joerg Bornemann
327f50083b cmake-gui: Fix {begin|end}ResetModel warnings 
QStandardItemModel::beginResetModel() and
QStandardItemModel::endResetModel() calls cannot be nested, and Qt will
produce warnings at runtime if such nesting is detected.

The nesting happened in two places:
1. QCMakeCacheModel::setViewType calls QCMakeCacheModel::setProperties.
Both called beginResetModel.
2. QCMakeCacheModel::setProperties calls QStandardItemModel::clear(),
which also calls beginResetModel.

The fix for 1 is to remove the {begin|end}ResetModel calls from
setViewType. The setProperties calls take care of the
{begin|end}ResetModel calls.

The fix for 2 is to replace the clear() call with a call that removes
all data rows.

Issue: #27376
 2025-11-13 08:08:15 -05:00
Kitware Robot
f276541247 CMake Nightly Date Stamp 2025-11-13 00:08:25 -05:00
Brad King
53a7f5b702 Help: Update 4.2 release note for Visual Studio 18.0 release 
The `Visual Studio 18 2026` generator is no longer experimental.
 2025-11-12 18:48:50 -05:00
Brad King
47d3a9b2da VS: Add CUDA flag table entry for nvcc --keep flag 
Fixes: #27380
 2025-11-12 15:04:09 -05:00
Brad King
322bf67a86 Merge branch 'backport-ci-debian-13' into ci-debian-13 2025-11-12 14:54:48 -05:00