diff options
| author |  Paul Beusterien <paulbeusterien@google.com> | 2018-06-05 07:51:07 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-05 07:51:07 -0700 |
| commit | 77227f58a03ac1383237f7239a337a7c061b5227 (patch) | |
| tree | bc0f66cd48927205ea976808b76a1475940da1eb | |
| parent | dc4f87527f61f0d20a5fc175ca19ad3f367133c1 (diff) | |
Consistent specification of preprocessor options in podspecs to work with the CocoaPods packager (#1378)
| -rw-r--r-- | FirebaseCore.podspec | 5 | ||||
| -rw-r--r-- | FirebaseFirestore.podspec | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index 220ca95..ddcb981 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -33,7 +33,8 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration ] s.dependency 'GoogleToolboxForMac/NSData+zlib', '~> 2.1' s.pod_target_xcconfig = { - 'OTHER_CFLAGS' => '-fno-autolink ' + - '-DFIRCore_VERSION=' + s.version.to_s + ' -DFirebase_VERSION=5.1.0' + 'OTHER_CFLAGS' => '-fno-autolink', + 'GCC_PREPROCESSOR_DEFINITIONS' => + 'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.1.0' } end diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index af9d241..01f8ea3 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -55,13 +55,13 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, s.frameworks = 'MobileCoreServices' s.library = 'c++' s.pod_target_xcconfig = { - 'GCC_PREPROCESSOR_DEFINITIONS' => 'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ', + 'GCC_PREPROCESSOR_DEFINITIONS' => 'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ' + + 'FIRFirestore_VERSION=' + s.version.to_s + ' PB_FIELD_16BIT', 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}" ' + '"${PODS_TARGET_SRCROOT}/Firestore/third_party/abseil-cpp" ' + '"${PODS_ROOT}/nanopb" ' + - '"${PODS_TARGET_SRCROOT}/Firestore/Protos/nanopb"', - 'OTHER_CFLAGS' => '-DFIRFirestore_VERSION=' + s.version.to_s + ' -DPB_FIELD_16BIT' + '"${PODS_TARGET_SRCROOT}/Firestore/Protos/nanopb"' } s.prepare_command = <<-CMD |