Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Rename POD_SRCROOT to PODS_ROOT.

  • Loading branch information...
commit ab3e75a6ddd0bdb1b3cf75722604fbdf3ea987ce 1 parent 4c27a97
@kommen kommen authored
Showing with 4 additions and 4 deletions.
  1. +3 −3 lib/cocoapods/installer.rb
  2. +1 −1  lib/cocoapods/specification.rb
View
6 lib/cocoapods/installer.rb
@@ -29,8 +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.
- 'POD_SRCROOT' => '$(SRCROOT)/Pods',
- 'HEADER_SEARCH_PATHS' => '"$(POD_SRCROOT)/Headers"',
+ 'PODS_ROOT' => '$(SRCROOT)/Pods',
+ 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers"',
'ALWAYS_SEARCH_USER_PATHS' => 'YES',
# This makes categories from static libraries work, which many libraries
# require, so we add these by default.
@@ -132,7 +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)'
+ config.buildSettings['PODS_ROOT'] = '$(SRCROOT)'
end
end
View
2  lib/cocoapods/specification.rb
@@ -296,7 +296,7 @@ def copy_header_mappings
# methods.
def header_search_paths
dirs = [header_dir] + copy_header_mappings.keys
- dirs.map { |dir| %{"$(POD_SRCROOT)/Headers/#{dir}"} }
+ dirs.map { |dir| %{"$(PODS_ROOT)/Headers/#{dir}"} }
end
def to_s
Please sign in to comment.
Something went wrong with that request. Please try again.