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
cc5ba373
Commit
cc5ba373
authored
Jan 24, 2018
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PodXCConfig] Always set PRODUCT_MODULE_NAME
parent
d2a1c4a4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
pod_xcconfig.rb
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
+1
-0
target_installer.rb
...nstaller/xcode/pods_project_generator/target_installer.rb
+0
-4
No files found.
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
View file @
cc5ba373
...
...
@@ -53,6 +53,7 @@ module Pod
'PODS_ROOT'
=>
'${SRCROOT}'
,
'PODS_TARGET_SRCROOT'
=>
target
.
pod_target_srcroot
,
'PRODUCT_BUNDLE_IDENTIFIER'
=>
'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
,
'PRODUCT_MODULE_NAME'
=>
target
.
product_module_name
,
'SKIP_INSTALL'
=>
'YES'
,
'SWIFT_ACTIVE_COMPILATION_CONDITIONS'
=>
'$(inherited) '
,
'SWIFT_INCLUDE_PATHS'
=>
'$(inherited) ${LIBRARY_SEARCH_PATHS}'
,
...
...
lib/cocoapods/installer/xcode/pods_project_generator/target_installer.rb
View file @
cc5ba373
...
...
@@ -82,15 +82,11 @@ module Pod
if
target
.
requires_frameworks?
framework_name
=
target
.
product_module_name
settings
[
'PRODUCT_NAME'
]
=
framework_name
if
target
.
static_framework?
settings
[
'PUBLIC_HEADERS_FOLDER_PATH'
]
=
framework_name
+
'.framework'
+
'/Headers'
settings
[
'PRIVATE_HEADERS_FOLDER_PATH'
]
=
framework_name
+
'.framework'
+
'/PrivateHeaders'
end
else
# if target.uses_swift?
# settings['PRODUCT_NAME'] = target.product_module_name
# end
settings
.
merge!
(
'OTHER_LDFLAGS'
=>
''
,
'OTHER_LIBTOOLFLAGS'
=>
''
)
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