Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
fa692b6b
Commit
fa692b6b
authored
Nov 07, 2013
by
Kevin Wales
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sets framework_search_paths conditionally based on platform
parent
fd82604d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
CHANGELOG.md
CHANGELOG.md
+6
-0
xcconfig_helper.rb
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+2
-1
No files found.
CHANGELOG.md
View file @
fa692b6b
...
@@ -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
)
...
...
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @
fa692b6b
...
@@ -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?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment