Commit 6966aef1 authored by Marius Rackwitz's avatar Marius Rackwitz

Set SKIP_INSTALL=YES for targets in Pods.xcodeproj

Fixes #3007.
parent c2e5a87b
...@@ -53,6 +53,7 @@ module Pod ...@@ -53,6 +53,7 @@ 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?
......
...@@ -54,6 +54,7 @@ module Pod ...@@ -54,6 +54,7 @@ module Pod
'PODS_ROOT' => '${SRCROOT}', 'PODS_ROOT' => '${SRCROOT}',
'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths), 'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths),
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1', 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
'SKIP_INSTALL' => 'YES',
# 'USE_HEADERMAP' => 'NO' # 'USE_HEADERMAP' => 'NO'
} }
......
...@@ -65,6 +65,10 @@ module Pod ...@@ -65,6 +65,10 @@ 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
#-----------------------------------------------------------------------# #-----------------------------------------------------------------------#
......
...@@ -62,6 +62,10 @@ module Pod ...@@ -62,6 +62,10 @@ module Pod
@xcconfig.to_hash['PODS_ROOT'].should == '${SRCROOT}' @xcconfig.to_hash['PODS_ROOT'].should == '${SRCROOT}'
end end
it 'will be skipped when installing' do
@xcconfig.to_hash['SKIP_INSTALL'].should == 'YES'
end
it 'saves the xcconfig' do it 'saves the xcconfig' do
path = temporary_directory + 'sample.xcconfig' path = temporary_directory + 'sample.xcconfig'
@generator.save_as(path) @generator.save_as(path)
......
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