Commit 5a2c29c0 authored by Gwendal Roué's avatar Gwendal Roué

[#221] HEADER_SEARCH_PATHS value comes from the new variable…

[#221] HEADER_SEARCH_PATHS value comes from the new variable PODS_HEADER_SEARCH_PATHS. PODS_HEADER_SEARCH_PATHS is set to public headers search paths in Pods.xcconfig, and to build headers search paths in Pods.xcodeproj.
parent 3f9aa837
...@@ -71,22 +71,25 @@ module Pod ...@@ -71,22 +71,25 @@ module Pod
pod.link_headers pod.link_headers
end end
xcconfig.merge!('HEADER_SEARCH_PATHS' => quoted(sandbox.build_header_storage.search_paths).join(" ")) # Indirect HEADER_SEARCH_PATHS, so that configure_build_configurations can override it
xcconfig.merge!('HEADER_SEARCH_PATHS' => '${PODS_HEADER_SEARCH_PATHS}')
xcconfig.merge!('PODS_HEADER_SEARCH_PATHS' => quoted(sandbox.public_header_storage.search_paths).join(" "))
support_files_group = @project.group("Targets Support Files").create_group(@target_definition.label) support_files_group = @project.group("Targets Support Files").create_group(@target_definition.label)
support_files_group.create_files(target_support_files) support_files_group.create_files(target_support_files)
xcconfig_file = support_files_group.files.where(:path => @target_definition.xcconfig_name) xcconfig_file = support_files_group.files.where(:path => @target_definition.xcconfig_name)
configure_build_configurations(xcconfig_file) configure_build_configurations(xcconfig_file, sandbox)
create_files(pods, sandbox) create_files(pods, sandbox)
end end
def configure_build_configurations(xcconfig_file) def configure_build_configurations(xcconfig_file, sandbox)
@target.build_configurations.each do |config| @target.build_configurations.each do |config|
config.base_configuration = xcconfig_file config.base_configuration = xcconfig_file
config.build_settings['OTHER_LDFLAGS'] = '' config.build_settings['OTHER_LDFLAGS'] = ''
config.build_settings['GCC_PREFIX_HEADER'] = @target_definition.prefix_header_name config.build_settings['GCC_PREFIX_HEADER'] = @target_definition.prefix_header_name
config.build_settings['PODS_ROOT'] = '${SRCROOT}' config.build_settings['PODS_ROOT'] = '${SRCROOT}'
config.build_settings['PODS_HEADER_SEARCH_PATHS'] = quoted(sandbox.build_header_storage.search_paths).join(" ")
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