Commit 8b3dd4c4 authored by Marius Rackwitz's avatar Marius Rackwitz

Ignore build setting CODE_SIGN_IDENTITY in UserProjectIntegrator#warn_about_xcconfig_overrides

parent 10870e7f
...@@ -132,6 +132,7 @@ module Pod ...@@ -132,6 +132,7 @@ module Pod
end end
end end
IGNORED_KEYS = %w(CODE_SIGN_IDENTITY)
INHERITED_FLAGS = ['$(inherited)', '${inherited}'] INHERITED_FLAGS = ['$(inherited)', '${inherited}']
# Checks whether the settings of the CocoaPods generated xcconfig are # Checks whether the settings of the CocoaPods generated xcconfig are
...@@ -144,7 +145,7 @@ module Pod ...@@ -144,7 +145,7 @@ module Pod
user_target.build_configurations.each do |config| user_target.build_configurations.each do |config|
xcconfig = aggregate_target.xcconfigs[config.name] xcconfig = aggregate_target.xcconfigs[config.name]
if xcconfig if xcconfig
xcconfig.to_hash.keys.each do |key| (xcconfig.to_hash.keys - IGNORED_KEYS).each do |key|
target_values = config.build_settings[key] target_values = config.build_settings[key]
if target_values && if target_values &&
!INHERITED_FLAGS.any? { |flag| target_values.include?(flag) } !INHERITED_FLAGS.any? { |flag| target_values.include?(flag) }
......
...@@ -90,6 +90,12 @@ module Pod ...@@ -90,6 +90,12 @@ module Pod
behaves_like 'warn_about_xcconfig_overrides' behaves_like 'warn_about_xcconfig_overrides'
UI.warnings.should.not.include 'GCC_PREPROCESSOR_DEFINITIONS' UI.warnings.should.not.include 'GCC_PREPROCESSOR_DEFINITIONS'
end end
it "ignores certain build settings which don't inherit the settings form the CocoaPods xcconfig" do
@user_target_build_settings = { 'CODE_SIGN_IDENTITY' => "Mac Developer" }
behaves_like 'warn_about_xcconfig_overrides'
UI.warnings.should.not.include 'CODE_SIGN_IDENTITY'
end
end 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