Skip to content

Commit

Permalink
[PodTargetInstaller] Don't generate an umbrella header when a custom …
Browse files Browse the repository at this point in the history
…module map is specified.
  • Loading branch information
segiddins committed May 6, 2015
1 parent 6d63114 commit 22c5805
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -37,6 +37,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Samuel Giddins](https://github.com/segiddins)
[#3502](https://github.com/CocoaPods/CocoaPods/issues/3502)

* Don't generate an umbrella header when a custom module map is specified. This
avoids an incomplete module map warning.
[Samuel Giddins](https://github.com/segiddins)


## 0.37.0

Expand Down
12 changes: 10 additions & 2 deletions lib/cocoapods/installer/target_installer/pod_target_installer.rb
Expand Up @@ -256,10 +256,10 @@ def add_file_to_support_group(path)
end

def create_module_map
return super unless module_map = target.file_accessors.first.module_map
return super unless custom_module_map
path = target.module_map_path
UI.message "- Copying module map file to #{UI.path(path)}" do
FileUtils.cp(module_map, path)
FileUtils.cp(custom_module_map, path)
add_file_to_support_group(path)

native_target.build_configurations.each do |c|
Expand All @@ -269,6 +269,14 @@ def create_module_map
end
end

def create_umbrella_header
return super unless custom_module_map
end

def custom_module_map
@custom_module_map ||= target.file_accessors.first.module_map
end

#-----------------------------------------------------------------------#
end
end
Expand Down

0 comments on commit 22c5805

Please sign in to comment.