diff options
| author |  rsgowman <rgowman@google.com> | 2018-06-18 09:56:21 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-18 09:56:21 -0400 |
| commit | 39e12ed16ce15d4c402fe079fc9f35869b669a6d (patch) | |
| tree | 361fadc488af95755bf5229debec6fe2ee382fe9 /Firestore/Example/ProtobufCpp.podspec | |
| parent | f92829fa7554031df1947c50d5f8fcd67365ea98 (diff) | |
| parent | 9e5c36b022b999b36f9a97d7eb44359f7fb2ac59 (diff) | |
Merge pull request #1416 from firebase/wilhuff/protobuf_cpp
Fixups to rsgowman/protobuf_cpp
Diffstat (limited to 'Firestore/Example/ProtobufCpp.podspec')
| -rw-r--r-- | Firestore/Example/ProtobufCpp.podspec | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Firestore/Example/ProtobufCpp.podspec b/Firestore/Example/ProtobufCpp.podspec index 8090b1e..c809c06 100644 --- a/Firestore/Example/ProtobufCpp.podspec +++ b/Firestore/Example/ProtobufCpp.podspec @@ -51,7 +51,10 @@ Pod::Spec.new do |s| # Set a CPP symbol so the code knows to use framework imports. s.pod_target_xcconfig = { - 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1', + 'GCC_PREPROCESSOR_DEFINITIONS' => + '$(inherited) ' + + 'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ' + + 'HAVE_PTHREAD=1', 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/ProtobufCpp/src"', # Cocoapods flattens header imports, leading to much anguish. The @@ -59,10 +62,13 @@ Pod::Spec.new do |s| # - https://github.com/CocoaPods/CocoaPods/issues/1437 'USE_HEADERMAP' => 'NO', 'ALWAYS_SEARCH_USER_PATHS' => 'NO', - - 'OTHER_CFLAGS' => '-DHAVE_PTHREAD' } + # Disable warnings that upstream does not concern itself with + s.compiler_flags = '$(inherited) ' + + '-Wno-comma ' + + '-Wno-shorten-64-to-32' + s.requires_arc = false s.library = 'c++' end |