From cf19fb27cb76c9e1aac5996432afabb5ab34026c Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Wed, 22 Aug 2018 09:35:59 -0500 Subject: [PATCH] Obey embedding rules for transitive aggregate targets --- Sources/XcodeGenKit/PBXProjGenerator.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/XcodeGenKit/PBXProjGenerator.swift b/Sources/XcodeGenKit/PBXProjGenerator.swift index c1dd470f..e575ce12 100644 --- a/Sources/XcodeGenKit/PBXProjGenerator.swift +++ b/Sources/XcodeGenKit/PBXProjGenerator.swift @@ -973,17 +973,17 @@ public class PBXProjGenerator { dependencies[dependency.reference] = dependency } case .target: - if let dependencyTarget = project.getTarget(dependency.reference) { - if isTopLevel || dependency.embed == nil { + if isTopLevel || dependency.embed == nil { + if let dependencyTarget = project.getTarget(dependency.reference) { dependencies[dependency.reference] = dependency if !dependencyTarget.shouldEmbedDependencies { // traverse target's dependencies if it doesn't embed them itself queue.append(dependencyTarget) } + } else if project.getAggregateTarget(dependency.reference) != nil { + // Aggregate targets should be included + dependencies[dependency.reference] = dependency } - } else if project.getAggregateTarget(dependency.reference) != nil { - // Aggregate targets should be included - dependencies[dependency.reference] = dependency } } }