Commit fa692b6b authored by Kevin Wales's avatar Kevin Wales

sets framework_search_paths conditionally based on platform

parent fd82604d
...@@ -46,6 +46,12 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -46,6 +46,12 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[Joshua Kalpin](https://github.com/Kapin) [Joshua Kalpin](https://github.com/Kapin)
[Core#38](https://github.com/CocoaPods/Core/pull/38) [Core#38](https://github.com/CocoaPods/Core/pull/38)
* Altered Framework_Search_Paths required by SenTestingKit so that
$(SDKROOT)/Developer/Library/Frameworks is used for iOS and
$(DEVELOPER_LIBRARY_DIR)/Frameworks is used for OSX
[Kevin Wales](https://github.com/kwales)
[#1562](https://github.com/CocoaPods/pull/1562)
## 0.27.1 ## 0.27.1
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.26.2...0.27.1) [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.26.2...0.27.1)
......
...@@ -105,8 +105,9 @@ module Pod ...@@ -105,8 +105,9 @@ module Pod
search_paths_to_add << '$(inherited)' search_paths_to_add << '$(inherited)'
if platform == :ios if platform == :ios
search_paths_to_add << '"$(SDKROOT)/Developer/Library/Frameworks"' search_paths_to_add << '"$(SDKROOT)/Developer/Library/Frameworks"'
else
search_paths_to_add << '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
end end
search_paths_to_add << '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
search_paths_to_add.each do |search_path| search_paths_to_add.each do |search_path|
unless search_paths.include?(search_path) unless search_paths.include?(search_path)
search_paths << ' ' unless search_paths.empty? search_paths << ' ' unless search_paths.empty?
......
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