Merge pull request #6287 from CocoaPods/pr_5514

Add aggregated search paths targets to vendored build settings

CHANGELOG.md

@@ -16,6 +16,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Mark Schall](https://github.com/maschall)
   [#5809](https://github.com/CocoaPods/CocoaPods/pull/5809)
 
+* Add aggregated search paths targets to vendored build settings  
+  [Chris Ortman](https://github.com/chrisortman)
+  [Johannes Plunien](https://github.com/plu)
+  [#5512](https://github.com/CocoaPods/CocoaPods/issues/5512)
+
 ##### Bug Fixes
 
 * Fix default LD_RUNPATH_SEARCH_PATHS for host targets.  

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -181,7 +181,9 @@ module Pod
         #   user target.
         #
         def generate_vendored_build_settings
-          pod_targets.each do |pod_target|
+          targets = pod_targets + target.search_paths_aggregate_targets.flat_map(&:pod_targets)
+
+          targets.each do |pod_target|
             unless pod_target.should_build? && pod_target.requires_frameworks?
               XCConfigHelper.add_settings_for_file_accessors_of_target(pod_target, @xcconfig)
             end

cocoapods-integration-specs @ 10fea933

-Subproject commit 4892acfe061146fe23a48a9dc0a470bba207649b
+Subproject commit 10fea93357d6dda5f26165f7d92c4c66a2b47168

spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb

@@ -15,11 +15,13 @@ module Pod
         before do
           @target_definition = fixture_target_definition
           @specs = specs
-          @specs.first.user_target_xcconfig = { 'OTHER_LDFLAGS' => '-no_compact_unwind' }
-          @specs.first.pod_target_xcconfig = { 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++11' }
+          @specs.first.user_target_xcconfig = { 'OTHER_LDFLAGS' => '-no_compact_unwind' } unless @specs.empty?
+          @specs.first.pod_target_xcconfig = { 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++11' } unless @specs.empty?
           @pod_targets = @specs.map { |spec| pod_target(spec, @target_definition) }
           @target = fixture_aggregate_target(@pod_targets, @target_definition)
-          @target.target_definition.whitelist_pod_for_configuration(@specs.first.name, 'Release')
+          unless @specs.empty?
+            @target.target_definition.whitelist_pod_for_configuration(@specs.first.name, 'Release')
+          end
           @generator = AggregateXCConfig.new(@target, 'Release')
         end
 
@@ -413,6 +415,28 @@ module Pod
             end
           end
         end
+
+        describe 'an empty pod target' do
+          before do
+            @blank_target = fixture_aggregate_target
+            @generator = AggregateXCConfig.new(@blank_target, 'Release')
+          end
+
+          it 'it should not have any framework search paths' do
+            @xcconfig = @generator.generate
+            @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.be.nil
+          end
+
+          describe 'with inherited targets' do
+            it 'should include inherited search paths' do
+              # It's the responsibility of the analyzer to
+              # populate this when the file is loaded.
+              @blank_target.search_paths_aggregate_targets = [@target]
+              @xcconfig = @generator.generate
+              @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.not.be.nil
+            end
+          end
+        end
       end
     end
   end