Allow enabling modular headers in the podfile

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 1f8ced657a224eabeba6958d130ee04058d91f60
+  revision: e0c6884b37ab6a44095a2bbdbfe9032627a90388
   branch: master
   specs:
     cocoapods-core (1.4.0)

lib/cocoapods/target/pod_target.rb

@@ -204,6 +204,7 @@ module Pod
     def defines_module?
       return @defines_module if defined?(@defines_module)
       return @defines_module = true if uses_swift? || requires_frameworks?
+      return @defines_module = true if target_definitions.any? { |td| td.build_pod_as_module?(pod_name) }
 
       @defines_module = non_test_specs.any? { |s| s.consumer(platform).pod_target_xcconfig['DEFINES_MODULE'] == 'YES' }
     end

spec/unit/target/pod_target_spec.rb

@@ -287,6 +287,19 @@ module Pod
           @pod_target.stubs(:defines_module?).returns(true)
         end
 
+        it 'uses modular header search paths when specified in the podfile' do
+          @pod_target.unstub(:defines_module?)
+          @pod_target.target_definitions.first.stubs(:build_pod_as_module?).with('BananaLib').returns(true)
+
+          @pod_target.build_headers.add_search_path('BananaLib', Platform.ios)
+          @pod_target.sandbox.public_headers.add_search_path('BananaLib', Platform.ios)
+          header_search_paths = @pod_target.header_search_paths
+          header_search_paths.sort.should == [
+            '${PODS_ROOT}/Headers/Private/BananaLib',
+            '${PODS_ROOT}/Headers/Public/BananaLib',
+          ]
+        end
+
         it 'returns the correct header search paths' do
           @pod_target.build_headers.add_search_path('BananaLib', Platform.ios)
           @pod_target.sandbox.public_headers.add_search_path('BananaLib', Platform.ios)