diff options
| author |  Rich Gowman <rgowman@google.com> | 2018-05-28 14:23:41 -0400 |
|---|---|---|
| committer | Rich Gowman <rgowman@google.com> | 2018-05-28 15:22:47 -0400 |
| commit | 2d071ec260efe196890dbacdbe9ffca8081e1edd (patch) | |
| tree | 279af75c350ef8ca5722b16dafe5cfa6f53d35ee /FirebaseFirestore.podspec | |
| parent | 42669a237f9c8fbcee4da10dc8c7aeaf2efeffe0 (diff) | |
Hookup serializer_test.cc to the xcode based test suite
This involves:
- building c++ libprotobuf (rather than just the obj-c version).
- adding c++ libprotobuf, c++ built protos (previously created) to the
*test suite* only (not to the main build).
- modifying existing nanopb CFLAGS to match those that are indirectly
pulled in.
Diffstat (limited to 'FirebaseFirestore.podspec')
| -rw-r--r-- | FirebaseFirestore.podspec | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index 564b0b3..7f4f340 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -61,7 +61,11 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, '"${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' + 'OTHER_CFLAGS' => '-DFIRFirestore_VERSION=' + s.version.to_s + ' ' + + # The nanopb pod (which is pulled in indirectly) sets these defs, so we must too. + # (We *do* require 16bit (or larger) fields, so we'd have to set at least + # PB_FIELD_16BIT anyways.) + '-DPB_FIELD_32BIT -DPB_NO_PACKED_STRUCTS=1' } s.prepare_command = <<-CMD |