Skip to content

Commit

Permalink
Merge pull request CocoaPods#3026 from andreacremaschi/master
Browse files Browse the repository at this point in the history
bugfixes in geos and spatialite
  • Loading branch information
keith committed Jul 17, 2013
2 parents 363932b + 100997f commit 4b172ff
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 1 addition & 2 deletions geos/3.3.8/geos.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,5 @@ CONFIG_H

s.preserve_paths = 'src/**/*.h', 'include/**/*.{h,inl,in}', 'capi/*.{h,in}'

s.xcconfig = { 'HEADER_SEARCH_PATHS' => '${PODS_ROOT}/geos/include ${PODS_ROOT}/geos/capi' }

s.xcconfig = { 'HEADER_SEARCH_PATHS' => '${PODS_ROOT}/geos/include ${PODS_ROOT}/geos/capi', 'CLANG_CXX_LIBRARY' => 'libstdc++'}
end
4 changes: 4 additions & 0 deletions spatialite/4.1.0/spatialite.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ CONFIG_H
# spatialite has a couple #include "*.c"
# the *.c files that are included can't be compiled

s.public_header_files = "src/headers/**/*.h"
s.private_header_files = "src/headers/spatialite_private.h"
s.header_mappings_dir = "src/headers/"

s.dependency 'geos'
s.dependency 'proj4'
# s.dependency 'freexl' # I comment this because there is a header search path conflict related to config.h between spatialite and freexl.
Expand Down

0 comments on commit 4b172ff

Please sign in to comment.