mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-3.31-custom-transitive-properties'

Browse Source
This commit is contained in:
Brad King
2025-02-23 08:36:56 -05:00
parent 5ac3cca63d 478d6cfd9a
commit 77c7397ab4
15 changed files with 198 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGeneratorExpressionNode.cxx
View File

@@ -484,13 +484,13 @@ protected:
{
if (context->HeadTarget) {
cmGeneratorExpressionDAGChecker dagChecker{
context->Backtrace,
context->HeadTarget,
genexOperator + ":" + expression,
content,
dagCheckerParent,
context->LG,
context->Config,
context->Backtrace,
};
switch (dagChecker.Check()) {
case cmGeneratorExpressionDAGChecker::SELF_REFERENCE:
@@ -2957,8 +2957,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
if (cm::optional<cmGeneratorTarget::TransitiveProperty> transitiveProp =
target->IsTransitiveProperty(propertyName, context->LG,
context->Config,
evaluatingLinkLibraries)) {
context->Config, dagCheckerParent)) {
interfacePropertyName = std::string(transitiveProp->InterfaceName);
isInterfaceProperty = transitiveProp->InterfaceName == propertyName;
usage = transitiveProp->Usage;
@@ -2993,8 +2992,13 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
}
cmGeneratorExpressionDAGChecker dagChecker{
context->Backtrace, target, propertyName, content,
dagCheckerParent, context->LG, context->Config,
target,
propertyName,
content,
dagCheckerParent,
context->LG,
context->Config,
context->Backtrace,
};
switch (dagChecker.Check()) {