Skip to content

C
cocoapods
Commit e0fab2a9 authored by Marius Rackwitz's avatar Marius Rackwitz
Browse files
Options

[XCConfig] Avoid duplicate occurences of '$(inherited)'

parent f672cc9d
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @ e0fab2a9
......@@ -59,6 +59,7 @@ module Pod
'PODS_ROOT' => target.relative_pods_root,
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ',
'LIBRARY_SEARCH_PATHS' => '$(inherited) ',
}
if pod_targets.any?(&:uses_swift?)
config['EMBEDDED_CONTENT_CONTAINS_SWIFT'] = 'YES'
......
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @ e0fab2a9
......@@ -253,8 +253,8 @@ module Pod
library_search_paths << dependent_target.configuration_build_dir(build_dir_var)
end
end
build_settings['FRAMEWORK_SEARCH_PATHS'] = '$(inherited) ' + XCConfigHelper.quote(framework_search_paths.uniq)
build_settings['LIBRARY_SEARCH_PATHS'] = '$(inherited) ' + XCConfigHelper.quote(library_search_paths.uniq)
build_settings['FRAMEWORK_SEARCH_PATHS'] = XCConfigHelper.quote(framework_search_paths.uniq)
build_settings['LIBRARY_SEARCH_PATHS'] = XCConfigHelper.quote(library_search_paths.uniq)
end
build_settings
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