Commit Graph

67986 Commits

Author SHA1 Message Date
Brad King a4adfc8e12 Merge topic 'test-fix-empty-elseif'
858ccfc941 Tests: Replace accidental empty elseif() with else()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !9995
2024-11-15 09:10:42 -05:00
Brad King 2c55b9c430 Merge topic 'patch-developer-docs'
c2f4183399 Help: Change PATHS to HINTS for pkg-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9999
2024-11-15 09:09:41 -05:00
Brad King bfabb555d8 Merge branch 'release-3.31' 2024-11-15 09:08:22 -05:00
Brad King 51b35881e5 Merge topic 'doc-vs-old-toolsets'
d44a201004 Help: Clarify instructions for using older VS toolsets with newer VS versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9997
2024-11-15 09:08:22 -05:00
Brad King 0dffd05287 Merge topic 'doc-vs-old-toolsets' into release-3.31
d44a201004 Help: Clarify instructions for using older VS toolsets with newer VS versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9997
2024-11-15 09:08:20 -05:00
Brad King 46acce6db5 Merge branch 'release-3.31' 2024-11-15 09:07:27 -05:00
Brad King dfaa2dc603 Merge topic 'deprecate-pre-3.10'
4c4f173876 Clarify advice given by compatibility deprecation message for CMake < 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Dženan Zukić <dzenan.zukic@kitware.com>
Merge-request: !9996
2024-11-15 09:07:26 -05:00
Brad King 1a6e8d8d33 Merge topic 'deprecate-pre-3.10' into release-3.31
4c4f173876 Clarify advice given by compatibility deprecation message for CMake < 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Dženan Zukić <dzenan.zukic@kitware.com>
Merge-request: !9996
2024-11-15 09:07:25 -05:00
Brad King 97c2f9ebfd Merge branch 'release-3.31' 2024-11-15 09:05:11 -05:00
Brad King 06397f3084 Merge topic 'ci-msvc-14.42'
41150f5c3d ci: Update Windows builds to MSVC 14.42 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10000
2024-11-15 09:05:11 -05:00
Brad King bf4167435a Merge topic 'ci-msvc-14.42' into release-3.31
41150f5c3d ci: Update Windows builds to MSVC 14.42 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10000
2024-11-15 09:05:09 -05:00
Kitware Robot 84c8003ece CMake Nightly Date Stamp 2024-11-15 00:01:41 -05:00
Peter Kokot c2f4183399 Help: Change PATHS to HINTS for pkg-config
When pkg-config is available and package is found with it, HINTS are a
better place where to hint the PC_Foo_* variables than PATHS. HINTS are
looked before the system default paths and those listed in PATHS.
2024-11-14 20:28:36 +01:00
Brad King 41150f5c3d ci: Update Windows builds to MSVC 14.42 toolset 2024-11-14 11:22:57 -05:00
Brad King d44a201004 Help: Clarify instructions for using older VS toolsets with newer VS versions
Clarify that the newer version of VS must also be installed to use its
corresponding CMake generator.

Issue: #26446
2024-11-14 10:03:32 -05:00
Brad King 03e7b8cb07 Merge topic 'simplify-removed-policies'
ff9bc7291a cmPolicies: Remove now-unused GetRequiredPolicyError method
659d8bd430 cmPolicies: Remove now-unused REQUIRED_IF_USED and REQUIRED_ALWAYS states
58a90857f0 cmPolicies: Simplify representation of removed policies
dade821948 cmPolicies: Reduce boilerplate in policy table entries
453916dfae cmPolicies: Add missing license notice
9a28b0654f cmGeneratorExpressionNode: Clarify constant in unreachable code path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !9993
2024-11-14 09:41:21 -05:00
Brad King 4c4f173876 Clarify advice given by compatibility deprecation message for CMake < 3.10
Since commit 84db8506ff (Deprecate compatibility with CMake versions older
than 3.10, 2024-10-03, v3.31.0-rc1~23^2) the `cmake_minimum_required` and
`cmake_policy` commands warn if the project does not enable policies as
of 3.10 or higher.  Clarify the advice given in the warning message about
how to update the version specification, particularly without actually
requiring a newer minimum version of CMake.
2024-11-14 09:40:01 -05:00
Brad King 51309a05fa Merge topic 'ctest-update-refactoring'
9c23f8ed26 cmCTestUpdateCommand: Remove handler usage
255b1af5af cmCTestUpdateHandler: Move class into cmCTestUpdateCommand.cxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9980
2024-11-14 09:04:04 -05:00
Kitware Robot 02d855d749 CMake Nightly Date Stamp 2024-11-14 00:01:24 -05:00
Brad King 858ccfc941 Tests: Replace accidental empty elseif() with else()
Issue: #26442
2024-11-13 15:31:12 -05:00
Brad King ff9bc7291a cmPolicies: Remove now-unused GetRequiredPolicyError method 2024-11-13 11:47:10 -05:00
Brad King 659d8bd430 cmPolicies: Remove now-unused REQUIRED_IF_USED and REQUIRED_ALWAYS states 2024-11-13 11:43:07 -05:00
Brad King 58a90857f0 cmPolicies: Simplify representation of removed policies
A policy that can be set defaults to `WARN` internally.
A policy that has been removed always uses `NEW`.
The `REQUIRED_IF_USED` and `REQUIRED_ALWAYS` states
are not needed.
2024-11-13 11:33:29 -05:00
Brad King dade821948 cmPolicies: Reduce boilerplate in policy table entries
Remove unnecessary `cmPolicies::` prefix from table entries. It can be
written where the entries are expanded.  This also prevents IWYU from
complaining that the table is written before `cmPolicies::PolicyStatus`
is declared.
2024-11-13 11:27:44 -05:00
Brad King 453916dfae cmPolicies: Add missing license notice 2024-11-13 11:23:19 -05:00
Brad King 9a28b0654f cmGeneratorExpressionNode: Clarify constant in unreachable code path 2024-11-13 09:38:24 -05:00
Brad King 1e0cd39460 Merge topic 'link-warning-as-error'
7907c83175 Link step: Add LINK_WARNING_AS_ERROR target property
656267c871 COMPILE_WARNING_AS_ERROR: rename methods to prepare link similar functionality

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9984
2024-11-13 09:24:36 -05:00
Brad King 92b3ae5d7d Merge branch 'release-3.31' 2024-11-13 09:19:25 -05:00
Brad King fe872cc98c Merge topic 'musl-linux-any'
d8559ec92e Linux: Recognize multiarch directories for musl-linux-any

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9991
2024-11-13 09:19:25 -05:00
Brad King 6a25904983 Merge topic 'musl-linux-any' into release-3.31
d8559ec92e Linux: Recognize multiarch directories for musl-linux-any

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9991
2024-11-13 09:19:23 -05:00
Brad King b5b921f0af Merge branch 'release-3.31' 2024-11-13 09:18:19 -05:00
Brad King d84abc02db Merge topic 'image-magick-7'
f6c6032e22 FindImageMagick: Fix ARCH_INCLUDE_DIR detection for version 7 and newer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9990
2024-11-13 09:18:19 -05:00
Brad King 3819471e71 Merge topic 'image-magick-7' into release-3.31
f6c6032e22 FindImageMagick: Fix ARCH_INCLUDE_DIR detection for version 7 and newer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9990
2024-11-13 09:18:18 -05:00
Brad King 4e1174d7a7 Merge branch 'release-3.31' 2024-11-13 09:17:25 -05:00
Brad King 8d652dc191 Merge topic 'WHOLE_ARCHIVE-various-systems'
d2997ab601 Linker configuration: Add missing platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9992
2024-11-13 09:17:25 -05:00
Brad King 10f24d1d92 Merge topic 'WHOLE_ARCHIVE-various-systems' into release-3.31
d2997ab601 Linker configuration: Add missing platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9992
2024-11-13 09:17:24 -05:00
Brad King 156ac6c728 Merge branch 'release-3.31' 2024-11-13 09:14:39 -05:00
Brad King fc5cdacb11 Merge topic 'gtest-discover-flush-duplicates'
007d7ea648 GoogleTest: Avoid extra call to set DISABLED test property in discovery
9a24c1e802 GoogleTest: Clear script content buffer on flush and flush less often

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9982
2024-11-13 09:14:38 -05:00
Brad King 7c999c19af Merge topic 'gtest-discover-flush-duplicates' into release-3.31
007d7ea648 GoogleTest: Avoid extra call to set DISABLED test property in discovery
9a24c1e802 GoogleTest: Clear script content buffer on flush and flush less often

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9982
2024-11-13 09:14:37 -05:00
Daniel Pfeifer 9c23f8ed26 cmCTestUpdateCommand: Remove handler usage 2024-11-13 10:54:57 +01:00
Daniel Pfeifer 255b1af5af cmCTestUpdateHandler: Move class into cmCTestUpdateCommand.cxx
Place declaration and definitions into places where following
refactoring will cause minimal deltas.
2024-11-13 10:39:44 +01:00
Kitware Robot 894ac85d6b CMake Nightly Date Stamp 2024-11-13 00:01:40 -05:00
Timo Röhling d8559ec92e Linux: Recognize multiarch directories for musl-linux-any
When bootstrapping Debian for musl-linux-any, the multiarch directories
are not found due to an overly-specific regular expression.

See https://bugs.debian.org/1085507 for the original bug report.
2024-11-12 10:47:40 -05:00
Marc Chevrier d2997ab601 Linker configuration: Add missing platforms
The following platforms were missing:
* Android
* WindowsCE, WindowsPhone, WindowsStore and WindowsKernelModeDriver

And enhance various Apple platforms support (iOS, tvOS, etc...)

Fixes: #26439
2024-11-12 16:46:54 +01:00
Timo Röhling f6c6032e22 FindImageMagick: Fix ARCH_INCLUDE_DIR detection for version 7 and newer
The `magick-baseconfig.h` header has been moved to a different subdirectory.

See https://bugs.debian.org/1087233 for the original bug report in Debian.
2024-11-12 10:38:54 -05:00
Craig Scott 007d7ea648 GoogleTest: Avoid extra call to set DISABLED test property in discovery
For very long test names, this can noticeably reduce the size of the
generated file contents when tests are disabled. This change reduces
how far beyond the flush threshold the content can grow before being
flushed.

Issue: #26431
2024-11-12 10:22:23 -05:00
Craig Scott 9a24c1e802 GoogleTest: Clear script content buffer on flush and flush less often
There's no need to check if flushing is needed after every command
is added to the variable holding the script content. It is enough to only
check once per test name. This simplifies the flushing logic, removing
the need for a separate flush_script() command. Previously, we were
not clearing the flushed script contents in all cases, but this is now
rigorously enforced at the one location where flushing is performed.

Also simplify the flushing of the list of test names, since that too doesn't
need a separate command. It is simpler and safer to handle that
directly inline where the one call to flush_tests_buffer() was
previously being made.

Fixes: #26431
2024-11-12 10:22:21 -05:00
Brad King c5840e2ebc Merge topic 'cmake-self-symlinks'
0994bc7929 cmake: Preserve symlinks in references to itself when possible
0925abb09b cmSystemTools: Invert condition to make non-bootstrap logic easier to follow
46ac308249 cmSystemTools: Factor out helpers from FindCMakeResources
b91ec8c48f cmSystemTools: Clarify decision to look for resources from the build tree
cbee4eed0f cmSystemTools: Re-order resource and tool finding logic
f6acf1f7b7 cmSystemTools: Reduce rightward drift in success path on UNIX
962e4479d4 cmSystemTools: Clarify app bundle layout on macOS
56632ddaa3 cmSystemTools: Remove redundant filesystem access on Windows
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Carlo Cabrera <carlo.antonio.cabrera@gmail.com>
Merge-request: !9987
2024-11-12 10:17:56 -05:00
Brad King 9b83c24494 Merge branch 'release-3.31' 2024-11-12 10:16:48 -05:00
Brad King b14df1b4bb Merge topic 'FindSQLite3-pkg-config'
2d228201fc Help: Guard calls to pkg_check_modules in cmake-developer(7) example
674a987898 FindSQLite3: Guard calls to pkg_check_modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9983
2024-11-12 10:16:48 -05:00