Commit 1d273a66 authored by Fabio Pelosin's avatar Fabio Pelosin

[PodTargetInstaller] Link to system frameworks in this step

parent d691d0bb
...@@ -49,7 +49,6 @@ module Pod ...@@ -49,7 +49,6 @@ module Pod
install_targets install_targets
install_system_frameworks install_system_frameworks
set_target_dependencies set_target_dependencies
link_aggregate_target
end end
# @return [Project] the generated Pods project. # @return [Project] the generated Pods project.
...@@ -176,12 +175,6 @@ module Pod ...@@ -176,12 +175,6 @@ module Pod
# #
# @return [void] # @return [void]
# #
def link_aggregate_target
aggregate_targets.each do |aggregate_target|
native_target = aggregate_target.target
aggregate_target.pod_targets.each do |pod_target|
product = pod_target.target.product_reference
native_target.frameworks_build_phase.add_file_reference(product)
end end
end end
end end
......
...@@ -21,6 +21,7 @@ module Pod ...@@ -21,6 +21,7 @@ module Pod
create_xcconfig_file create_xcconfig_file
create_prefix_header create_prefix_header
create_dummy_source create_dummy_source
link_to_system_frameworks
end end
end end
...@@ -132,6 +133,24 @@ module Pod ...@@ -132,6 +133,24 @@ module Pod
end end
end end
# Add a file reference to the system frameworks if needed and links the
# target to them.
#
# This is done only for informative purposes as the xcconfigs are the
# authoritative source of the build settings.
#
# @return [void]
#
def link_to_system_frameworks
UI.message "- Linking to system frameworks" do
library.specs.each do |spec|
spec.consumer(library.platform).frameworks.each do |framework|
project.add_system_framework(framework, library.target)
end
end
end
end
ENABLE_OBJECT_USE_OBJC_FROM = { ENABLE_OBJECT_USE_OBJC_FROM = {
:ios => Version.new('6'), :ios => Version.new('6'),
:osx => Version.new('10.8') :osx => Version.new('10.8')
......
...@@ -146,6 +146,10 @@ module Pod ...@@ -146,6 +146,10 @@ module Pod
dummy.read.should.include?('@interface PodsDummy_Pods') dummy.read.should.include?('@interface PodsDummy_Pods')
end end
xit 'links to system frameworks' do
end
#--------------------------------------------------------------------------------# #--------------------------------------------------------------------------------#
describe "concerning ARC before and after iOS 6.0 and OS X 10.8" do describe "concerning ARC before and after iOS 6.0 and OS X 10.8" do
......
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