diff options
| author |  Gil <mcg@google.com> | 2018-07-13 11:09:44 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-13 11:09:44 -0700 |
| commit | fb9f24eaee4c57d09ec0dca32abff840b39f7c7e (patch) | |
| tree | 95bde20bd905b2a2647ff60c09435526070cac9a /Firestore/Protos | |
| parent | 855a7665aef505db456aa1c6f1cb9ea2b68056da (diff) | |
Convert googletest and nanopb CMake builds to add_subdirectory (#1522)
* Add a download-only boringssl ExternalProject
Match boringssl version to grpc submodule version
Note: not yet in use
* Split grpc into separate download and build tasks
This allows other external targets to download into the gRPC source tree
before grpc is actually built.
* Convert grpc to an http download
* Build googletest with add_subdirectory
Also:
* Revert library-name modifications in the abseil-cpp build
* Move abseil-cpp add_subdirectory build into place
* Build nanopb with add_subdirectory
* Force nanopb first to work around ODR violations
This is a temporary work-around for b/111328563.
Diffstat (limited to 'Firestore/Protos')
| -rw-r--r-- | Firestore/Protos/CMakeLists.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Firestore/Protos/CMakeLists.txt b/Firestore/Protos/CMakeLists.txt index fdf45e7..214c15f 100644 --- a/Firestore/Protos/CMakeLists.txt +++ b/Firestore/Protos/CMakeLists.txt @@ -53,13 +53,6 @@ cc_library( protobuf-nanopb ) -target_compile_definitions( - firebase_firestore_protos_nanopb - PUBLIC -DPB_FIELD_16BIT -) - -# TODO(rsgowman): this may be worth moving into cc_library, possibly via an -# INCLUDE_DIRS or similar. target_include_directories( firebase_firestore_protos_nanopb PUBLIC ${FIREBASE_SOURCE_DIR}/Firestore/Protos/nanopb |