Commit 1ee0ffbb authored by Marius Rackwitz's avatar Marius Rackwitz

Inline build setting SKIP_INSTALL for AggregateTarget

parent 6966aef1
...@@ -53,7 +53,6 @@ module Pod ...@@ -53,7 +53,6 @@ module Pod
'OTHER_LIBTOOLFLAGS' => '$(OTHER_LDFLAGS)', 'OTHER_LIBTOOLFLAGS' => '$(OTHER_LDFLAGS)',
'PODS_ROOT' => target.relative_pods_root, 'PODS_ROOT' => target.relative_pods_root,
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1', 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
'SKIP_INSTALL' => 'YES',
} }
if target.requires_frameworks? if target.requires_frameworks?
......
...@@ -41,6 +41,7 @@ module Pod ...@@ -41,6 +41,7 @@ module Pod
'OTHER_LDFLAGS' => '', 'OTHER_LDFLAGS' => '',
'OTHER_LIBTOOLFLAGS' => '', 'OTHER_LIBTOOLFLAGS' => '',
'PODS_ROOT' => '$(SRCROOT)', 'PODS_ROOT' => '$(SRCROOT)',
'SKIP_INSTALL' => 'YES',
} }
super.merge(settings) super.merge(settings)
end end
......
...@@ -65,10 +65,6 @@ module Pod ...@@ -65,10 +65,6 @@ module Pod
it 'should configure OTHER_LIBTOOLFLAGS flags to include OTHER_LDFLAGS' do it 'should configure OTHER_LIBTOOLFLAGS flags to include OTHER_LDFLAGS' do
@xcconfig.to_hash['OTHER_LIBTOOLFLAGS'].should == '$(OTHER_LDFLAGS)' @xcconfig.to_hash['OTHER_LIBTOOLFLAGS'].should == '$(OTHER_LDFLAGS)'
end end
it 'will be skipped when installing' do
@xcconfig.to_hash['SKIP_INSTALL'].should == 'YES'
end
end end
#-----------------------------------------------------------------------# #-----------------------------------------------------------------------#
......
...@@ -101,6 +101,13 @@ module Pod ...@@ -101,6 +101,13 @@ module Pod
end end
end end
it 'will be skipped when installing' do
@installer.install!
@installer.target.native_target.build_configurations.each do |config|
config.build_settings['SKIP_INSTALL'].should == 'YES'
end
end
#--------------------------------------# #--------------------------------------#
it 'creates the xcconfig file' do it 'creates the xcconfig file' 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