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
293e6bd4
Commit
293e6bd4
authored
Mar 03, 2015
by
Marius Rackwitz
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3217 from mrackwitz/mr-framework-search-paths
Set FRAMEWORK_SEARCH_PATHS only when needed
parents
31807c80
36395db0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
CHANGELOG.md
CHANGELOG.md
+5
-0
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+3
-1
aggregate_xcconfig_spec.rb
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
+10
-0
No files found.
CHANGELOG.md
View file @
293e6bd4
...
...
@@ -11,6 +11,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
*
Correctly filter Xcode warnings about the use of dynamic frameworks.
[
Boris Bügling
](
https://github.com/neonichu
)
*
Fixes warnings, when the aggregate target doesn't contain any pod target, which is build,
because
`PODS_FRAMEWORK_BUILD_PATH`
was added to
`FRAMEWORK_SEARCH_PATHS`
, but never created.
[
Marius Rackwitz
](
https://github.com/mrackwitz
)
[
#3217
](
https://github.com/CocoaPods/CocoaPods/issues/3217
)
## 0.36.0.rc.1
...
...
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
293e6bd4
...
...
@@ -60,10 +60,12 @@ module Pod
header_search_paths
=
pod_targets
.
map
{
|
target
|
"$PODS_FRAMEWORK_BUILD_PATH/
#{
target
.
product_name
}
/Headers"
}
build_settings
=
{
'PODS_FRAMEWORK_BUILD_PATH'
=>
target
.
configuration_build_dir
,
'FRAMEWORK_SEARCH_PATHS'
=>
'"$PODS_FRAMEWORK_BUILD_PATH"'
,
# Make headers discoverable by `import "…"`
'OTHER_CFLAGS'
=>
'$(inherited) '
+
XCConfigHelper
.
quote
(
header_search_paths
,
'-iquote'
),
}
if
target
.
pod_targets
.
any?
(
&
:should_build?
)
build_settings
[
'FRAMEWORK_SEARCH_PATHS'
]
=
'"$PODS_FRAMEWORK_BUILD_PATH"'
end
config
.
merge!
(
build_settings
)
else
# Make headers discoverable from $PODS_ROOT/Headers directory
...
...
spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
View file @
293e6bd4
...
...
@@ -129,6 +129,16 @@ module Pod
behaves_like
'AggregateXCConfig'
describe
'with a vendored-library pod'
do
def
spec
fixture_spec
(
'monkey/monkey.podspec'
)
end
it
'does not add the framework build path to the xcconfig'
do
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
.
be
.
nil?
end
end
it
'sets the PODS_FRAMEWORK_BUILD_PATH build variable'
do
@xcconfig
.
to_hash
[
'PODS_FRAMEWORK_BUILD_PATH'
].
should
==
'$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Pods'
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