Merge pull request #3896 from russbishop/master

CHANGELOG.md

@@ -4,6 +4,16 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## Master
+
+##### Bug Fixes
+
+* Fix generation of xcconfig files that specify both `-iquote` and `-isystem`
+  headers.  
+  [Russ Bishop](https://github.com/russbishop)
+  [#3893](https://github.com/CocoaPods/CocoaPods/issues/3893)
+
+
 ## 0.38.1
 
 ##### Enhancements

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -109,7 +109,7 @@ module Pod
               # Make library headers discoverale by `#import "…"`
               library_header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
               build_settings['HEADER_SEARCH_PATHS'] = XCConfigHelper.quote(library_header_search_paths)
-              build_settings['OTHER_CFLAGS'] += XCConfigHelper.quote(library_header_search_paths, '-isystem')
+              build_settings['OTHER_CFLAGS'] += ' ' + XCConfigHelper.quote(library_header_search_paths, '-isystem')
             end
             if pod_targets.any? { |t| t.should_build? && t.scoped? }
               build_settings['FRAMEWORK_SEARCH_PATHS'] = '$(inherited) "$PODS_FRAMEWORK_BUILD_PATH"'

spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb

@@ -164,8 +164,10 @@ module Pod
             end
 
             it 'includes the public header paths as system headers' do
-              expected = '-isystem "${PODS_ROOT}/Headers/Public"'
-              @xcconfig.to_hash['OTHER_CFLAGS'].should.include expected
+              expected = '$(inherited) -iquote "$CONFIGURATION_BUILD_DIR/OrangeFramework.framework/Headers" -isystem "${PODS_ROOT}/Headers/Public"'
+              @generator.stubs(:pod_targets).returns([@pod_target, pod_target(fixture_spec('orange-framework/OrangeFramework.podspec'))])
+              @xcconfig = @generator.generate
+              @xcconfig.to_hash['OTHER_CFLAGS'].should == expected
             end
 
             it 'includes the public header paths as user headers' do