Matthew Woehlke
99ac59d31b
style: Remove trailing blank lines from all CMake sources
...
Our development workflow tooling prevents trailing blank lines
from being added, but some such lines remain from before that
was enforced. Remove them to make it easier to rename files
without triggering enforcement.
2024-11-21 15:48:02 -05:00
Brad King
908b2ca27c
Merge topic 'doc-find-root-dir'
...
b431306f22 Help: Clarify the Xxx_ROOT_DIR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !10006
2024-11-19 10:20:40 -05:00
Brad King
542c3259a3
Merge topic 'armclang-no--list'
...
688d9ee9c2 ARMClang: Remove orphaned linker --list option
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10008
2024-11-19 10:15:38 -05:00
Brad King
bc07eab9f2
Merge branch 'release-3.31'
2024-11-19 10:14:42 -05:00
Brad King
af3a48a591
Merge topic 'Linux-deduplication-static-libs'
...
0445190d2f LLD linker: avoid regression on archive libraries deduplication
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10010
2024-11-19 10:14:42 -05:00
Brad King
6b9aee9f38
Merge topic 'Linux-deduplication-static-libs' into release-3.31
...
0445190d2f LLD linker: avoid regression on archive libraries deduplication
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10010
2024-11-19 10:14:40 -05:00
Brad King
93de9104c2
Merge branch 'release-3.31'
2024-11-19 10:12:41 -05:00
Brad King
365aab5650
Merge topic 'update-libarchive'
...
ddb72eb3e6 Merge branch 'upstream-LibArchive' into update-libarchive
ad48f00c30 LibArchive 2024-10-13 (b439d586)
e048b0cc94 libarchive: Update script to get 3.7.7
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10011
2024-11-19 10:12:40 -05:00
Brad King
a59e24cd50
Merge topic 'update-libarchive' into release-3.31
...
ddb72eb3e6 Merge branch 'upstream-LibArchive' into update-libarchive
ad48f00c30 LibArchive 2024-10-13 (b439d586)
e048b0cc94 libarchive: Update script to get 3.7.7
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10011
2024-11-19 10:12:38 -05:00
Brad King
941812426b
Merge topic 'doc-cli-color'
...
1224fbce3f Help: Document CLICOLOR and CLICOLOR_FORCE environment variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Ziaee <concussious@runbox.com>
Merge-request: !10009
2024-11-19 10:01:34 -05:00
Kitware Robot
0662a7b4d7
CMake Nightly Date Stamp
2024-11-19 00:01:43 -05:00
Marc Chevrier
0445190d2f
LLD linker: avoid regression on archive libraries deduplication
...
Due to a bug on LLD linker for ELF binaries, deduplication should
occur only if CMP0156 and CMP0179 are NEW.
Fixes : #26447
2024-11-18 21:02:50 +01:00
Brad King
ddb72eb3e6
Merge branch 'upstream-LibArchive' into update-libarchive
...
# By LibArchive Upstream
* upstream-LibArchive:
LibArchive 2024-10-13 (b439d586)
2024-11-18 14:17:22 -05:00
LibArchive Upstream
ad48f00c30
LibArchive 2024-10-13 (b439d586)
...
Code extracted from:
https://github.com/libarchive/libarchive.git
at commit b439d586f53911c84be5e380445a8a259e19114c (v3.7.7).
2024-11-18 14:17:22 -05:00
Brad King
e048b0cc94
libarchive: Update script to get 3.7.7
2024-11-18 14:15:17 -05:00
Daniel Brondani
688d9ee9c2
ARMClang: Remove orphaned linker --list option
...
Setting the `armlink --list` option without other diagnostic flags is
misleading because it produces an empty file and prevents the user from
printing diagnostics to the standard output or redirecting them to
another file.
It's unclear why the flag was added when support for ARMClang was first
added by commit 7b0abaac31 (ARMClang: Add support for Clang-based ARM
compiler, 2019-05-13, v3.15.0-rc1~111^2).
Fixes : #21538
2024-11-18 13:59:16 -05:00
Brad King
1224fbce3f
Help: Document CLICOLOR and CLICOLOR_FORCE environment variables
...
Issue: #26451
2024-11-18 13:00:22 -05:00
Brad King
ce49c5debb
Merge topic 'FindPython-Tests-limited'
...
1dd5cf1e08 Tests/FindPython: only use limited API
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10002
2024-11-18 11:12:05 -05:00
Kitware Robot
0948a7fa83
CMake Nightly Date Stamp
2024-11-18 00:01:39 -05:00
Kitware Robot
c1fd1aa0f2
CMake Nightly Date Stamp
2024-11-17 00:02:10 -05:00
Craig Scott
8706bc0934
Merge branch 'release-3.31'
2024-11-16 16:16:49 -05:00
Craig Scott
30f596f417
Merge topic 'cmp0175-restore-USES_TERMINAL-for-TARGET-form'
...
62586f236c CMP0175: Do not reject USES_TERMINAL for add_custom_command(TARGET)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10005
2024-11-16 16:16:48 -05:00
Craig Scott
74c1b88859
Merge topic 'cmp0175-restore-USES_TERMINAL-for-TARGET-form' into release-3.31
...
62586f236c CMP0175: Do not reject USES_TERMINAL for add_custom_command(TARGET)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !10005
2024-11-16 16:16:47 -05:00
Peter Kokot
b431306f22
Help: Clarify the Xxx_ROOT_DIR
...
The Xxx_ROOT_DIR is optional result variable set by find module when
package is found. It is the base directory of the Xxx installation. The
`Xxx_ROOT` is a hint variable set by the user where to look for the
`Xxx` package.
2024-11-16 21:51:43 +01:00
Brad King
a8bdbf748f
Merge branch 'release-3.31'
2024-11-16 08:05:14 -05:00
Brad King
253572335d
Merge topic 'ci-xcode-16.1'
...
c99002c289 ci: update macOS jobs to use Xcode 16.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10004
2024-11-16 08:05:14 -05:00
Brad King
88d85700e0
Merge topic 'ci-xcode-16.1' into release-3.31
...
c99002c289 ci: update macOS jobs to use Xcode 16.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10004
2024-11-16 08:05:13 -05:00
Kitware Robot
6863502326
CMake Nightly Date Stamp
2024-11-16 00:01:34 -05:00
Craig Scott
62586f236c
CMP0175: Do not reject USES_TERMINAL for add_custom_command(TARGET)
...
Fixes : #26449
2024-11-16 10:02:01 +11:00
Brad King
c99002c289
ci: update macOS jobs to use Xcode 16.1
2024-11-15 10:10:28 -05:00
Brad King
ddb7167a0c
Merge topic 'ios-compiler-inspection'
...
79a83ddb08 Apple: Enable linking during iOS/tvOS/visionOS/watchOS toolchain inspection
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9998
2024-11-15 09:11:39 -05:00
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
Rolf Eike Beer
1dd5cf1e08
Tests/FindPython: only use limited API
...
Newer Python versions (namely 3.13) do not support old compilers before
gcc 4.8 for atomics, which leads to compile errors in the test case.
Since the test actually does not use any of that API, restrict it to the
limited Python API which offers even more stability across versions.
2024-11-15 08:58:37 -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
79a83ddb08
Apple: Enable linking during iOS/tvOS/visionOS/watchOS toolchain inspection
...
Since commit 11da882a12 (Apple: Introduce separate system name for iOS,
tvOS, and watchOS, 2018-01-15, v3.14.0-rc1~14^2~1) our toolchain
inspection steps, like ABI detection, tell `try_compile` to use a
`STATIC_LIBRARY` instead of an `EXECUTABLE`. This was needed at the
time to avoid codesign requirements. However, commit d3a64c4e3f (Xcode:
Explicitly turn off signing in try_compile projects, 2020-07-16,
v3.19.0-rc1~483^2) introduced a more general solution to that problem.
Restore linking during toolchain inspection so that we can detect and
identify the linker.
Suggested-by: Marc Chevrier <marc.chevrier@gmail.com>
Fixes : #26443
2024-11-14 11:06:49 -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