Commit Graph

73138 Commits

Author SHA1 Message Date
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
Brad King 8832f78dd6 IWYU: Update for Debian 13 CI job
`include-what-you-use` diagnostics, in practice, are specific to
the environment's compiler and standard library.  Update includes
to satisfy IWYU for our CI job under Debian 13.  Some patterns:

* Types named in virtual `override` signatures no longer require
  includes since the overridden signature already names them.

* A function argument's type needs to be included even if its constructor
  is called only by implicit conversion.  For example, constructing a
  `std::function` from a lambda now requires `<functional>`.

* Some prior mysterious `<type_traits>` inclusions are no longer required.
2025-11-12 14:54:35 -05:00
Brad King f49b0e6759 IWYU: Update for Debian 13 CI job
`include-what-you-use` diagnostics, in practice, are specific to
the environment's compiler and standard library.  Update includes
to satisfy IWYU for our CI job under Debian 13.  Some patterns:

* Types named in virtual `override` signatures no longer require
  includes since the overridden signature already names them.

* A function argument's type needs to be included even if its constructor
  is called only by implicit conversion.  For example, constructing a
  `std::function` from a lambda now requires `<functional>`.

* Some prior mysterious `<type_traits>` inclusions are no longer required.
2025-11-12 14:54:16 -05:00
Brad King 3653b3e95e Merge branch 'backport-ci-debian-13' into ci-debian-13 2025-11-12 14:44:43 -05:00
Brad King 1445a8e7db ci: use Debian 13 images and environments 2025-11-12 14:35:12 -05:00
Brad King 9eedf6c1a9 ci: Update base images to Debian 13 2025-11-12 14:35:11 -05:00
Brad King 36bdb7b2de ci: Update to TIClang 4.0.4 2025-11-12 14:35:11 -05:00
Brad King 48f091a166 ci: Update debian12-ninja job to use Swift 6.2.1 2025-11-12 14:35:11 -05:00
Brad King 388e2ae0a5 FindPostgreSQL: Add support for version 17 2025-11-12 14:35:11 -05:00
Brad King a0642acbce FindImageMagick: Fix detection of version 7 from headers 2025-11-12 14:35:11 -05:00
Brad King faf8addc71 FindJNI: Add Debian/Ubuntu specific paths for more recent JDK versions 2025-11-12 14:35:11 -05:00
Brad King 038cb65bc6 Tests/FindJNI/Minimal: Fix test for Java 24 and above 2025-11-12 14:35:10 -05:00
Brad King a0059a2771 cmDocumentationFormatter: Implement PrintFormatted privately 2025-11-12 14:35:10 -05:00
Brad King 02f3f5d801 Merge topic 'cmake-E-copy-system-errors'
fb7a904e90 cmcmd: report system errors on more filesystem operations
4795cb6550 Merge branch 'upstream-KWSys' into cmake-E-copy-system-errors
dc8cc945ee KWSys 2025-11-12 (1139f8a0)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11401
2025-11-12 11:59:48 -05:00
Frank Winklmeier fb7a904e90 cmcmd: report system errors on more filesystem operations
Print the system error message in case of failure when calling
`CopyFileAlways`, `CopyFileIfDifferent`, `CopyFileIfNewer`,
`CopyADirectory` and `MakeDirectory`.

Remove unnecessary `cmSystemTools` wrappers for `CopyFileIfNewer` and
`CopyADirectory`.

Fixes: #18276
2025-11-12 11:53:35 -05:00
Brad King 4795cb6550 Merge branch 'upstream-KWSys' into cmake-E-copy-system-errors
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2025-11-12 (1139f8a0)
2025-11-12 11:53:21 -05:00
KWSys Upstream dc8cc945ee KWSys 2025-11-12 (1139f8a0)
Code extracted from:

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

at commit 1139f8a044044860e9a4c3b964750cbe68fe3f6d (master).

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

Brad King (2):
      abb5ca15 SystemTools: Fix CopyFileIfNewer error status when source is missing
      001e388f Directory: Restore Load() error for missing directory on Windows
2025-11-12 11:53:21 -05:00
Brad King 515bb02443 Merge topic 'package-info-from-install-export'
34343922a5 install: Add ability to generate CPS from install(EXPORT)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11315
2025-11-12 11:53:07 -05:00
Brad King 64ffd3b323 Merge topic 'findopengl-glvnd-legacy'
32a5f11e50 FindOpenGL: respect legacy preference for OpenGL and GLX libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11385
2025-11-12 11:51:27 -05:00
Brad King 8ff110d4be Merge topic 'test-pch'
dac2823975 Tests: Split RunCMake.PrecompileHeaders into multiple tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11410
2025-11-12 11:49:10 -05:00
Brad King 621ed2eabd Merge branch 'release-4.2' 2025-11-12 11:47:16 -05:00
Brad King 4c1ace5fba Merge topic 'fbuild_byproducts'
b1b3602cda FASTBuild: remove non-existent autogen byproducts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11405
2025-11-12 11:47:16 -05:00
Brad King 203a1cb1c5 Merge topic 'fbuild_byproducts' into release-4.2
b1b3602cda FASTBuild: remove non-existent autogen byproducts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11405
2025-11-12 11:47:14 -05:00
Brad King 3e5f4aa5c5 Merge branch 'release-4.2' 2025-11-12 11:42:13 -05:00
Brad King 31c38f722a Merge topic 'fbuild_unique_names'
d6bc1a8a50 FASTBuild: rename test target to RUN_TESTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11403
2025-11-12 11:42:13 -05:00
Brad King 3c276579e2 Merge topic 'fbuild_unique_names' into release-4.2
d6bc1a8a50 FASTBuild: rename test target to RUN_TESTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11403
2025-11-12 11:42:11 -05:00
Brad King 87ad7d7251 Merge branch 'release-4.2' 2025-11-12 10:55:32 -05:00
Brad King 923b91a13f Merge branch 'release-4.1' 2025-11-12 10:55:25 -05:00
Brad King 2f03112816 Merge branch 'release-4.0' 2025-11-12 10:55:18 -05:00
Brad King 94828640ba Merge branch 'release-3.31' 2025-11-12 10:55:00 -05:00
Brad King 94931ca3a1 Merge branch 'release-4.1' into release-4.2 2025-11-12 10:54:44 -05:00
Brad King 54d8b32e23 Merge branch 'release-4.2' 2025-11-12 10:53:50 -05:00