[PodXCConfig] Use recursive dependent targets

parent 4c4b69bd
...@@ -63,7 +63,7 @@ module Pod ...@@ -63,7 +63,7 @@ module Pod
@xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig) @xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig)
end end
XCConfigHelper.add_target_specific_settings(target, @xcconfig) XCConfigHelper.add_target_specific_settings(target, @xcconfig)
@xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, target.dependent_targets) @xcconfig.merge! XCConfigHelper.settings_for_dependent_targets(target, target.recursive_dependent_targets)
@xcconfig @xcconfig
end end
......
...@@ -184,6 +184,15 @@ module Pod ...@@ -184,6 +184,15 @@ module Pod
end.uniq end.uniq
end end
# @return [Array<PodTarget>] the recursive targets that this target has a
# dependency upon.
#
def recursive_dependent_targets
targets = dependent_targets + dependent_targets.flat_map(&:dependent_targets)
targets.uniq!
targets
end
# Checks if the target should be included in the build configuration with # Checks if the target should be included in the build configuration with
# the given name of a given target definition. # the given name of a given target definition.
# #
......
Subproject commit ccf9b780f7d7f28395ec15bad15b8e3eee800d47 Subproject commit 4560c5c5bbc2fe7d6efe055b41b5fae622640826
...@@ -286,6 +286,11 @@ describe_cli 'pod' do ...@@ -286,6 +286,11 @@ describe_cli 'pod' do
behaves_like cli_spec 'install_using_checkout_options', behaves_like cli_spec 'install_using_checkout_options',
'install --no-repo-update' 'install --no-repo-update'
end end
describe 'Integrates a pod with search paths inheritance' do
behaves_like cli_spec 'install_search_paths_inheritance',
'install --no-repo-update'
end
end end
#--------------------------------------# #--------------------------------------#
......
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