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
cfd00055
Commit
cfd00055
authored
Mar 20, 2018
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove SWIFT_INCLUDE_PATHS for dependant targets with no swift
parent
3db51207
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
xcconfig_helper.rb
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+1
-1
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
xcconfig_helper_spec.rb
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
+2
-0
No files found.
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @
cfd00055
...
@@ -346,9 +346,9 @@ module Pod
...
@@ -346,9 +346,9 @@ module Pod
"${PODS_ROOT}/
#{
dependent_target
.
module_map_path
.
relative_path_from
(
dependent_target
.
sandbox
.
root
)
}
"
"${PODS_ROOT}/
#{
dependent_target
.
module_map_path
.
relative_path_from
(
dependent_target
.
sandbox
.
root
)
}
"
end
end
module_map_files
<<
%(-fmodule-map-file="#{module_map_file}")
module_map_files
<<
%(-fmodule-map-file="#{module_map_file}")
swift_import_paths
<<
dependent_target
.
configuration_build_dir
(
CONFIGURATION_BUILD_DIR_VARIABLE
)
if
dependent_target
.
uses_swift?
end
end
end
end
swift_import_paths
<<
dependent_target
.
configuration_build_dir
(
CONFIGURATION_BUILD_DIR_VARIABLE
)
end
end
build_settings
[
'FRAMEWORK_SEARCH_PATHS'
]
=
XCConfigHelper
.
quote
(
framework_search_paths
.
uniq
)
build_settings
[
'FRAMEWORK_SEARCH_PATHS'
]
=
XCConfigHelper
.
quote
(
framework_search_paths
.
uniq
)
...
...
cocoapods-integration-specs
@
2d208060
Subproject commit
8037f4d7cf4b08d5af3f6e2867dbfa15edaf9dc2
Subproject commit
2d2080607906ab24b07f513c2c5028ca38d9713c
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
View file @
cfd00055
...
@@ -69,12 +69,14 @@ module Pod
...
@@ -69,12 +69,14 @@ module Pod
:should_build?
=>
true
,
:should_build?
=>
true
,
:requires_frameworks?
=>
true
,
:requires_frameworks?
=>
true
,
:configuration_build_dir
=>
'AB'
,
:configuration_build_dir
=>
'AB'
,
:uses_swift?
=>
false
,
)
)
target2
=
stub
(
'target2'
,
target2
=
stub
(
'target2'
,
:specs
=>
[
'B'
],
:specs
=>
[
'B'
],
:should_build?
=>
true
,
:should_build?
=>
true
,
:requires_frameworks?
=>
true
,
:requires_frameworks?
=>
true
,
:configuration_build_dir
=>
'B'
,
:configuration_build_dir
=>
'B'
,
:uses_swift?
=>
false
,
)
)
dependent_targets
=
[
target1
,
target2
]
dependent_targets
=
[
target1
,
target2
]
build_settings
=
@sut
.
search_paths_for_dependent_targets
(
nil
,
dependent_targets
)
build_settings
=
@sut
.
search_paths_for_dependent_targets
(
nil
,
dependent_targets
)
...
...
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