Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Correctly configure POD_SRCROOT for Pods and target project.

  • Loading branch information...
commit 4c27a975bbd6c1e6ff44cbb370f61d62df455baf 1 parent 82a6c8f
@kommen kommen authored
Showing with 3 additions and 2 deletions.
  1. +3 −1 lib/cocoapods/installer.rb
  2. +0 −1  lib/cocoapods/xcodeproj_ext.rb
View
4 lib/cocoapods/installer.rb
@@ -29,7 +29,8 @@ def initialize(podfile, project, definition)
def xcconfig
@xcconfig ||= Xcodeproj::Config.new({
# In a workspace this is where the static library headers should be found.
- 'HEADER_SEARCH_PATHS' => '"Pods/Headers"',
+ 'POD_SRCROOT' => '$(SRCROOT)/Pods',
+ 'HEADER_SEARCH_PATHS' => '"$(POD_SRCROOT)/Headers"',
'ALWAYS_SEARCH_USER_PATHS' => 'YES',
# This makes categories from static libraries work, which many libraries
# require, so we add these by default.
@@ -131,6 +132,7 @@ def install!
config.baseConfiguration = xcconfig_file
config.buildSettings['OTHER_LDFLAGS'] = ''
config.buildSettings['GCC_PREFIX_HEADER'] = prefix_header_filename
+ config.buildSettings['POD_SRCROOT'] = '$(SRCROOT)'
end
end
View
1  lib/cocoapods/xcodeproj_ext.rb
@@ -99,7 +99,6 @@ def self.for_platform(platform)
def self.build_settings(platform, scheme)
settings = COMMON_BUILD_SETTINGS[:all].merge(COMMON_BUILD_SETTINGS[platform])
settings['COPY_PHASE_STRIP'] = scheme == :debug ? 'NO' : 'YES'
- settings['POD_SRCROOT'] = '$(SRCROOT)'
if scheme == :debug
settings.merge!(COMMON_BUILD_SETTINGS[:debug])
settings['ONLY_ACTIVE_ARCH'] = 'YES' if platform == :osx
Please sign in to comment.
Something went wrong with that request. Please try again.