Skip to content

Commit 8afe636

Browse files
eskrocheskroch
committed
Merge branch 'master' into release-2.1
2 parents 7b10f6e + 114de15 commit 8afe636

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

‎CorePlot-latest.podspec‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ Pod::Spec.new do |s|
3333
s.osx.source_files = 'framework/MacOnly/*.{h,m}'
3434
s.private_header_files = '**/_*.h', '**/CorePlotProbes.h'
3535

36-
s.requires_arc = true
37-
s.ios.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Public/CorePlot/ios"' }
38-
s.osx.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Public/CorePlot/osx"' }
39-
s.tvos.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Public/CorePlot/tvos"' }
36+
s.requires_arc = true
37+
s.xcconfig = { 'ALWAYS_SEARCH_USER_PATHS' => 'YES' }
38+
s.ios.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Private/CorePlot/ios"' }
39+
s.osx.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Private/CorePlot/osx"' }
40+
s.tvos.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Private/CorePlot/tvos"' }
4041

4142
s.frameworks = 'QuartzCore', 'Accelerate'
4243
s.ios.frameworks = 'UIKit', 'Foundation'

‎CorePlot.podspec‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ Pod::Spec.new do |s|
3333
s.osx.source_files = 'framework/MacOnly/*.{h,m}'
3434
s.private_header_files = '**/_*.h', '**/CorePlotProbes.h'
3535

36-
s.requires_arc = true
37-
s.ios.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Public/CorePlot/ios"' }
38-
s.osx.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Public/CorePlot/osx"' }
39-
s.tvos.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Public/CorePlot/tvos"' }
36+
s.requires_arc = true
37+
s.xcconfig = { 'ALWAYS_SEARCH_USER_PATHS' => 'YES' }
38+
s.ios.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Private/CorePlot/ios"' }
39+
s.osx.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Private/CorePlot/osx"' }
40+
s.tvos.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Headers/Private/CorePlot/tvos"' }
4041

4142
s.frameworks = 'QuartzCore', 'Accelerate'
4243
s.ios.frameworks = 'UIKit', 'Foundation'

0 commit comments

Comments
 (0)