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
a210a7e7
Commit
a210a7e7
authored
May 15, 2015
by
Marius Rackwitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AggregateXCConfig] Move pod_targets in helper method
parent
27475a53
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
1 deletion
+15
-1
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+15
-1
No files found.
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
a210a7e7
...
@@ -49,7 +49,6 @@ module Pod
...
@@ -49,7 +49,6 @@ module Pod
# @return [Xcodeproj::Config]
# @return [Xcodeproj::Config]
#
#
def
generate
def
generate
pod_targets
=
target
.
pod_targets_for_build_configuration
(
@configuration_name
)
config
=
{
config
=
{
'OTHER_LDFLAGS'
=>
'$(inherited) '
+
XCConfigHelper
.
default_ld_flags
(
target
),
'OTHER_LDFLAGS'
=>
'$(inherited) '
+
XCConfigHelper
.
default_ld_flags
(
target
),
'PODS_ROOT'
=>
target
.
relative_pods_root
,
'PODS_ROOT'
=>
target
.
relative_pods_root
,
...
@@ -134,6 +133,21 @@ module Pod
...
@@ -134,6 +133,21 @@ module Pod
@xcconfig
.
merge!
(
'LD_RUNPATH_SEARCH_PATHS'
=>
ld_runpath_search_paths
.
join
(
' '
))
@xcconfig
.
merge!
(
'LD_RUNPATH_SEARCH_PATHS'
=>
ld_runpath_search_paths
.
join
(
' '
))
end
end
private
#---------------------------------------------------------------------#
# !@group Private Helpers
# Returns the {PodTarget}s which are active for the current
# configuration name.
#
# @return [Array<PodTarget>]
#
def
pod_targets
target
.
pod_targets_for_build_configuration
(
@configuration_name
)
end
#---------------------------------------------------------------------#
#---------------------------------------------------------------------#
end
end
end
end
...
...
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