[TargetInstaller] Added PODS_HEADERS_SEARCH_PATHS to xcconfig.

lib/cocoapods/installer/target_installer.rb

@@ -13,9 +13,10 @@ module Pod
       def xcconfig
         @xcconfig ||= Xcodeproj::Config.new({
           # In a workspace this is where the static library headers should be found.
-          'PODS_ROOT'                => @target_definition.relative_pods_root,
-          'ALWAYS_SEARCH_USER_PATHS' => 'YES', # needed to make EmbedReader build
-          'OTHER_LDFLAGS'            => default_ld_flags,
+          'PODS_ROOT'                 => @target_definition.relative_pods_root,
+          'PODS_HEADERS_SEARCH_PATHS' => '${PODS_PUBLIC_HEADERS_SEARCH_PATHS}',
+          'ALWAYS_SEARCH_USER_PATHS'  => 'YES', # needed to make EmbedReader build
+          'OTHER_LDFLAGS'             => default_ld_flags,
         })
       end
 
@@ -72,9 +73,9 @@ module Pod
         end
         @target.add_source_files(source_file_descriptions)
 
-        xcconfig.merge!('HEADER_SEARCH_PATHS' => quoted(sandbox.build_headers.search_paths).join(" "))
-        # Indirect HEADER_SEARCH_PATHS, so that configure_build_configurations can override it
-        xcconfig.merge!('PODS_HEADER_SEARCH_PATHS' => quoted(sandbox.public_headers.search_paths).join(" "))
+        xcconfig.merge!('HEADER_SEARCH_PATHS' => '${PODS_HEADERS_SEARCH_PATHS}')
+        xcconfig.merge!('PODS_BUILD_HEADERS_SEARCH_PATHS' => quoted(sandbox.build_headers.search_paths).join(" "))
+        xcconfig.merge!('PODS_PUBLIC_HEADERS_SEARCH_PATHS' => quoted(sandbox.public_headers.search_paths).join(" "))
 
         support_files_group = @project.group("Targets Support Files").create_group(@target_definition.label)
         support_files_group.create_files(target_support_files)
@@ -90,7 +91,7 @@ module Pod
           config.build_settings['OTHER_LDFLAGS'] = ''
           config.build_settings['GCC_PREFIX_HEADER'] = @target_definition.prefix_header_name
           config.build_settings['PODS_ROOT'] = '${SRCROOT}'
-          config.build_settings['PODS_HEADER_SEARCH_PATHS'] = quoted(sandbox.build_headers.search_paths).join(" ")
+          config.build_settings['PODS_HEADERS_SEARCH_PATHS'] = '${PODS_BUILD_HEADERS_SEARCH_PATHS}'
         end
       end