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
91b1699f
Commit
91b1699f
authored
Nov 30, 2017
by
Tyler Stromberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Also quote library names
parent
70c2f308
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
xcconfig_helper.rb
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+1
-1
xcconfig_helper_spec.rb
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
+5
-1
No files found.
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @
91b1699f
...
@@ -247,7 +247,7 @@ module Pod
...
@@ -247,7 +247,7 @@ module Pod
build_settings
=
{
build_settings
=
{
'LIBRARY_SEARCH_PATHS'
=>
quote
([
dirname
]),
'LIBRARY_SEARCH_PATHS'
=>
quote
([
dirname
]),
}
}
build_settings
[
'OTHER_LDFLAGS'
]
=
"-l
#{
name
}
"
if
include_ld_flags
build_settings
[
'OTHER_LDFLAGS'
]
=
"-l
\"
#{
name
}
\"
"
if
include_ld_flags
xcconfig
.
merge!
(
build_settings
)
xcconfig
.
merge!
(
build_settings
)
end
end
...
...
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
View file @
91b1699f
...
@@ -161,10 +161,14 @@ module Pod
...
@@ -161,10 +161,14 @@ module Pod
it
'quotes OTHER_LDFLAGS to properly handle spaces'
do
it
'quotes OTHER_LDFLAGS to properly handle spaces'
do
framework_path
=
config
.
sandbox
.
root
+
'Sample/Framework with Spaces.framework'
framework_path
=
config
.
sandbox
.
root
+
'Sample/Framework with Spaces.framework'
library_path
=
config
.
sandbox
.
root
+
'Sample/libSample Lib.a'
xcconfig
=
Xcodeproj
::
Config
.
new
xcconfig
=
Xcodeproj
::
Config
.
new
@sut
.
add_framework_build_settings
(
framework_path
,
xcconfig
,
config
.
sandbox
.
root
)
@sut
.
add_framework_build_settings
(
framework_path
,
xcconfig
,
config
.
sandbox
.
root
)
@sut
.
add_library_build_settings
(
library_path
,
xcconfig
,
config
.
sandbox
.
root
)
hash_config
=
xcconfig
.
to_hash
hash_config
=
xcconfig
.
to_hash
hash_config
[
'OTHER_LDFLAGS'
].
should
==
'-framework "Framework with Spaces"'
hash_config
[
'OTHER_LDFLAGS'
].
should
==
'-
l"Sample Lib" -
framework "Framework with Spaces"'
end
end
it
'check that include_ld_flags being false doesnt generate OTHER_LDFLAGS'
do
it
'check that include_ld_flags being false doesnt generate OTHER_LDFLAGS'
do
...
...
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