Commit 55b24295 authored by Marius Rackwitz's avatar Marius Rackwitz

Merge pull request #4829 from CocoaPods/mr-xcconfig-dont-recursive-transitive-deps

[XCConfig] Don't recurse for transitive dependencies
parents f1b2521b a4bf0098
...@@ -55,6 +55,11 @@ module Pod ...@@ -55,6 +55,11 @@ module Pod
XCConfigHelper.add_static_dependency_build_settings(target, xcconfig, file_accessor) XCConfigHelper.add_static_dependency_build_settings(target, xcconfig, file_accessor)
end end
XCConfigHelper.add_dynamic_dependency_build_settings(target, xcconfig) XCConfigHelper.add_dynamic_dependency_build_settings(target, xcconfig)
if target.requires_frameworks?
target.dependent_targets.each do |dependent_target|
XCConfigHelper.add_dynamic_dependency_build_settings(dependent_target, xcconfig)
end
end
end end
# Adds build settings for static vendored frameworks and libraries. # Adds build settings for static vendored frameworks and libraries.
...@@ -86,12 +91,6 @@ module Pod ...@@ -86,12 +91,6 @@ module Pod
# The xcconfig to edit. # The xcconfig to edit.
# #
def self.add_dynamic_dependency_build_settings(target, xcconfig) def self.add_dynamic_dependency_build_settings(target, xcconfig)
if target.requires_frameworks?
target.dependent_targets.each do |dependent_target|
XCConfigHelper.add_dynamic_dependency_build_settings(dependent_target, xcconfig)
end
end
target.file_accessors.each do |file_accessor| target.file_accessors.each do |file_accessor|
file_accessor.vendored_dynamic_frameworks.each do |vendored_dynamic_framework| file_accessor.vendored_dynamic_frameworks.each do |vendored_dynamic_framework|
XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, target.sandbox.root) XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, target.sandbox.root)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment