Commit 84dacd49 authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #3429 from EZ-NET/InheritFrameworkSearchPaths

Adding $(inherited) to "FRAMEWORK_SEARCH_PATHS" build setting in xcconfi...
parents f2ee638f 4af90a61
...@@ -15,6 +15,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -15,6 +15,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### Bug Fixes
* Adding `$(inherited)` to `FRAMEWORK_SEARCH_PATHS` build setting in xcconfig for aggregate.
[Tomohiro Kumagai](https://github.com/EZ-NET)
[#3429](https://github.com/CocoaPods/CocoaPods/pull/3429)
* Don't crash when the downloader can't find an appropriate podspec in a `git` * Don't crash when the downloader can't find an appropriate podspec in a `git`
pod. pod.
[Samuel Giddins](https://github.com/segiddins) [Samuel Giddins](https://github.com/segiddins)
......
...@@ -64,7 +64,7 @@ module Pod ...@@ -64,7 +64,7 @@ module Pod
'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-iquote'), 'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-iquote'),
} }
if target.pod_targets.any?(&:should_build?) if target.pod_targets.any?(&:should_build?)
build_settings['FRAMEWORK_SEARCH_PATHS'] = '"$PODS_FRAMEWORK_BUILD_PATH"' build_settings['FRAMEWORK_SEARCH_PATHS'] = '$(inherited) "$PODS_FRAMEWORK_BUILD_PATH"'
end end
config.merge!(build_settings) config.merge!(build_settings)
else else
......
Subproject commit 79c9522a24befa20029b881118aac302dac65800 Subproject commit c304744bab51c323cbe9a07d54900b3a372adfdc
...@@ -144,7 +144,7 @@ module Pod ...@@ -144,7 +144,7 @@ module Pod
end end
it 'adds the framework build path to the xcconfig, with quotes, as framework search paths' do it 'adds the framework build path to the xcconfig, with quotes, as framework search paths' do
@xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '"$PODS_FRAMEWORK_BUILD_PATH"' @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '$(inherited) "$PODS_FRAMEWORK_BUILD_PATH"'
end end
it 'adds the framework header paths to the xcconfig, with quotes, as local headers' do it 'adds the framework header paths to the xcconfig, with quotes, as local headers' do
......
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