Commit Graph

69428 Commits

Author SHA1 Message Date
Brad King
b3da9c6d60 GenEx: Evaluate LINK_LIBRARIES target properties transitively
The `LINK_LIBRARIES` and `INTERFACE_LINK_LIBRARIES` target properties
establish the graph of link dependencies used to propagate usage
requirements transitively.  Therefore the `$<TARGET_PROPERTY:...>`
generator expression should evaluate them transitively as it does for
other transitive properties.  Add policy CMP0189 for compatibility.

Fixes: #26709
Issue: #12435
2025-02-24 11:43:47 -05:00
Brad King
63788c7568 Merge branch 'release-4.0' 2025-02-24 11:20:58 -05:00
Brad King
1113623d25 Merge branch 'release-3.31' 2025-02-24 11:20:39 -05:00
Brad King
12e76f1e26 Merge branch 'release-3.31' into release-4.0 2025-02-24 11:20:20 -05:00
Brad King
859ca5c4d7 CMake 3.31.6 2025-02-24 10:53:17 -05:00
Brad King
861354ec9b Merge branch 'release-4.0' 2025-02-24 10:45:03 -05:00
Brad King
22737da627 Merge branch 'release-3.31' 2025-02-24 10:44:51 -05:00
Brad King
806fe88cb6 Merge branch 'release-3.30' 2025-02-24 10:44:32 -05:00
Brad King
db1478d145 Merge branch 'release-3.31' into release-4.0 2025-02-24 10:44:06 -05:00
Brad King
1e2e9ceccf Merge branch 'release-3.30' into release-3.31 2025-02-24 10:43:52 -05:00
Brad King
2bd6fbe1b0 CMake 3.30.8 2025-02-24 10:09:52 -05:00
Brad King
4d6ad5b22c Merge branch 'release-4.0' 2025-02-24 09:20:17 -05:00
Brad King
0ae938be80 Merge branch 'release-3.31' 2025-02-24 09:20:15 -05:00
Brad King
437cca4187 Merge branch 'release-3.30' 2025-02-24 09:20:13 -05:00
Brad King
d256fd9566 Merge branch 'release-3.31' into release-4.0 2025-02-24 09:19:47 -05:00
Brad King
70c8f9b249 Merge branch 'release-3.30' into release-3.31 2025-02-24 09:19:29 -05:00
Brad King
7fb69c7452 Merge topic 'backport-3.31-custom-transitive-properties' into release-3.31
8b5af40b34 GenEx: Fix evaluation of LINK_LIBRARIES as custom transitive property
161f703e76 GenEx: Restore evaluation context for conditional transitive properties
419c19d531 Tests: Extend CustomTransitiveProperties with custom transitive LINK_LIBRARIES
ff2004d430 Tests: Extend CustomTransitiveProperties with non-transitive LINK_LIBRARIES
d7f1a100d9 Tests: Split CustomTransitiveProperties argument checks into helper
2ccbad90e6 cmGeneratorExpressionDAGChecker: Construct with initializer list syntax
99fee5720d cmGeneratorExpressionDAGChecker: De-duplicate constructor signature
82151ea289 cmGeneratorExpressionDAGChecker: Construct with initializer list syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10384
2025-02-24 09:18:58 -05:00
Brad King
d061599f5c Merge topic 'backport-3.30-custom-transitive-properties' into release-3.30
8b5af40b34 GenEx: Fix evaluation of LINK_LIBRARIES as custom transitive property
161f703e76 GenEx: Restore evaluation context for conditional transitive properties
419c19d531 Tests: Extend CustomTransitiveProperties with custom transitive LINK_LIBRARIES
ff2004d430 Tests: Extend CustomTransitiveProperties with non-transitive LINK_LIBRARIES
d7f1a100d9 Tests: Split CustomTransitiveProperties argument checks into helper
99fee5720d cmGeneratorExpressionDAGChecker: De-duplicate constructor signature
82151ea289 cmGeneratorExpressionDAGChecker: Construct with initializer list syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10384
2025-02-24 09:17:34 -05:00
Brad King
2bd2044a4d Merge branch 'release-4.0' 2025-02-24 09:15:47 -05:00
Brad King
f48beab388 Merge topic 'custom-transitive-properties'
77c7397ab4 Merge branch 'backport-3.31-custom-transitive-properties'
478d6cfd9a Merge branch 'backport-3.30-custom-transitive-properties'
8b5af40b34 GenEx: Fix evaluation of LINK_LIBRARIES as custom transitive property
161f703e76 GenEx: Restore evaluation context for conditional transitive properties
419c19d531 Tests: Extend CustomTransitiveProperties with custom transitive LINK_LIBRARIES
ff2004d430 Tests: Extend CustomTransitiveProperties with non-transitive LINK_LIBRARIES
d7f1a100d9 Tests: Split CustomTransitiveProperties argument checks into helper
5ac3cca63d Merge branch 'backport-3.31-custom-transitive-properties' (early part)
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10384
2025-02-24 09:15:47 -05:00
Brad King
02b3ed79a0 Merge topic 'custom-transitive-properties' into release-4.0
77c7397ab4 Merge branch 'backport-3.31-custom-transitive-properties'
478d6cfd9a Merge branch 'backport-3.30-custom-transitive-properties'
8b5af40b34 GenEx: Fix evaluation of LINK_LIBRARIES as custom transitive property
161f703e76 GenEx: Restore evaluation context for conditional transitive properties
419c19d531 Tests: Extend CustomTransitiveProperties with custom transitive LINK_LIBRARIES
ff2004d430 Tests: Extend CustomTransitiveProperties with non-transitive LINK_LIBRARIES
d7f1a100d9 Tests: Split CustomTransitiveProperties argument checks into helper
5ac3cca63d Merge branch 'backport-3.31-custom-transitive-properties' (early part)
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10384
2025-02-24 09:15:45 -05:00
Brad King
58e1155d42 Merge topic 'ci-linkcheck'
3c175b5f2c ci: Tell linkcheck to tolerate redirect to versioned variant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10388
2025-02-24 09:04:59 -05:00
Kitware Robot
a29c2e1cf0 CMake Nightly Date Stamp 2025-02-24 00:07:23 -05:00
Brad King
3c175b5f2c ci: Tell linkcheck to tolerate redirect to versioned variant 2025-02-23 09:15:47 -05:00
Brad King
77c7397ab4 Merge branch 'backport-3.31-custom-transitive-properties' 2025-02-23 08:36:56 -05:00
Brad King
478d6cfd9a Merge branch 'backport-3.30-custom-transitive-properties' 2025-02-23 08:33:12 -05:00
Brad King
8b5af40b34 GenEx: Fix evaluation of LINK_LIBRARIES as custom transitive property
Fix logic from commit b9ee79b8a1 (GenEx: Add support for custom
transitive compile properties, 2024-05-09, v3.30.0-rc1~82^2~1) to more
precisely know when we are computing the link dependency graph.

Issue: #20416
Issue: #26709
2025-02-23 08:30:42 -05:00
Brad King
161f703e76 GenEx: Restore evaluation context for conditional transitive properties
In commit e8010b67c7 (cmGeneratorExpressionDAGChecker: Make local
generator available in constructor, 2024-04-25, v3.30.0-rc1~172^2~6)
we accidentally failed to preserve `EvaluateInterfaceProperty`'s
consistency with `TargetPropertyNode::Evaluate`.  Fix its local
generator selection to match the evaluation context.
2025-02-23 08:30:33 -05:00
Brad King
419c19d531 Tests: Extend CustomTransitiveProperties with custom transitive LINK_LIBRARIES
Demonstrate presence of extra entries due to not always avoiding repeat
visits.
2025-02-23 08:28:32 -05:00
Brad King
ff2004d430 Tests: Extend CustomTransitiveProperties with non-transitive LINK_LIBRARIES 2025-02-23 08:26:45 -05:00
Brad King
d7f1a100d9 Tests: Split CustomTransitiveProperties argument checks into helper 2025-02-23 08:25:32 -05:00
Kitware Robot
e185e7d706 CMake Nightly Date Stamp 2025-02-23 00:08:34 -05:00
Brad King
833cdca28b Merge topic 'cmake-gui-test-qt6'
245f5ca8b3 Tests: Make CMakeGUI test build with both Qt5 and Qt6
5afbc739dc ci: Specify Qt version separately for each Fedora build
e35d1ee4cd cmake-gui: Clarify variable name for selected Qt major version
19a1c115e0 cmake-gui: Fix integer conversion warnings with Qt 6
cbf0d3da52 cmake-gui: Port away from deprecated API in Qt >= 6.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10369
2025-02-22 09:49:25 -05:00
Brad King
5ac3cca63d Merge branch 'backport-3.31-custom-transitive-properties' (early part) 2025-02-22 09:41:13 -05:00
Brad King
8fa7d330d2 Merge branch 'backport-3.30-custom-transitive-properties' (early part) 2025-02-22 09:39:45 -05:00
Brad King
2ccbad90e6 cmGeneratorExpressionDAGChecker: Construct with initializer list syntax 2025-02-22 09:11:20 -05:00
Brad King
99fee5720d cmGeneratorExpressionDAGChecker: De-duplicate constructor signature 2025-02-22 08:46:44 -05:00
Brad King
82151ea289 cmGeneratorExpressionDAGChecker: Construct with initializer list syntax 2025-02-22 08:33:20 -05:00
Kitware Robot
96d71dbbbd CMake Nightly Date Stamp 2025-02-22 00:05:50 -05:00
Alexandru Croitor
245f5ca8b3 Tests: Make CMakeGUI test build with both Qt5 and Qt6
Fixes: #26710
2025-02-21 14:41:12 -05:00
Brad King
5afbc739dc ci: Specify Qt version separately for each Fedora build
Currently all builds use Qt 5.  Prepare to switch some to Qt 6.
2025-02-21 14:41:12 -05:00
Brad King
e35d1ee4cd cmake-gui: Clarify variable name for selected Qt major version 2025-02-21 14:41:12 -05:00
Brad King
19a1c115e0 cmake-gui: Fix integer conversion warnings with Qt 6 2025-02-21 14:41:12 -05:00
Brad King
cbf0d3da52 cmake-gui: Port away from deprecated API in Qt >= 6.7 2025-02-21 12:39:19 -05:00
Brad King
8b8cf1ac8e Merge topic 'update-jsoncpp'
af65a5d98b Merge branch 'upstream-jsoncpp' into update-jsoncpp
6a4aca62f6 jsoncpp 2024-09-09 (89e2973c)
3dec83ae8c jsoncpp: Update script to get jsoncpp 1.9.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10379
2025-02-21 09:21:31 -05:00
Brad King
6da08ab967 Merge topic 'patch-1'
b69d64f72b FindwxWidgets: special case -latomic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10377
2025-02-21 09:16:51 -05:00
Brad King
638b42532c Merge topic 'nsis-uninst-name'
33e85acff7 CPack/NSIS: Use the installed display name in uninstall prompt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10368
2025-02-21 09:14:51 -05:00
Brad King
ff579a02e2 Merge branch 'release-4.0' 2025-02-21 09:13:01 -05:00
Brad King
f0140a6e72 Merge topic 'policy-version-env'
33856b1d62 Add CMAKE_POLICY_VERSION_MINIMUM environment variable
04721acc6c Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in initial cache script
729470ff6d Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in script mode
6cd10ffed7 Tests: Cover CMAKE_POLICY_VERSION_MINIMUM as cache entry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: John Parent <john.parent@kitware.com>
Merge-request: !10376
2025-02-21 09:13:01 -05:00
Brad King
1d606df7cc Merge topic 'policy-version-env' into release-4.0
33856b1d62 Add CMAKE_POLICY_VERSION_MINIMUM environment variable
04721acc6c Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in initial cache script
729470ff6d Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in script mode
6cd10ffed7 Tests: Cover CMAKE_POLICY_VERSION_MINIMUM as cache entry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: John Parent <john.parent@kitware.com>
Merge-request: !10376
2025-02-21 09:12:59 -05:00