From fb9f24eaee4c57d09ec0dca32abff840b39f7c7e Mon Sep 17 00:00:00 2001 From: Gil Date: Fri, 13 Jul 2018 11:09:44 -0700 Subject: 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. --- Firestore/core/src/firebase/firestore/local/CMakeLists.txt | 4 +++- Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt | 4 +++- Firestore/core/src/firebase/firestore/remote/CMakeLists.txt | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'Firestore/core') diff --git a/Firestore/core/src/firebase/firestore/local/CMakeLists.txt b/Firestore/core/src/firebase/firestore/local/CMakeLists.txt index 5a47187..f1c65c4 100644 --- a/Firestore/core/src/firebase/firestore/local/CMakeLists.txt +++ b/Firestore/core/src/firebase/firestore/local/CMakeLists.txt @@ -22,6 +22,9 @@ cc_library( local_serializer.h local_serializer.cc DEPENDS + # TODO(b/111328563) Force nanopb first to work around ODR violations + protobuf-nanopb + LevelDB::LevelDB absl_strings firebase_firestore_model @@ -29,5 +32,4 @@ cc_library( firebase_firestore_protos_nanopb firebase_firestore_remote firebase_firestore_util - protobuf-nanopb ) diff --git a/Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt b/Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt index fd34c2e..0471b1c 100644 --- a/Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt +++ b/Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt @@ -21,7 +21,9 @@ cc_library( writer.h writer.cc DEPENDS + # TODO(b/111328563) Force nanopb first to work around ODR violations + protobuf-nanopb + firebase_firestore_util firebase_firestore_protos_nanopb - protobuf-nanopb ) diff --git a/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt b/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt index a2bdbe2..af62ab1 100644 --- a/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt +++ b/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt @@ -22,10 +22,12 @@ cc_library( serializer.h serializer.cc DEPENDS + # TODO(b/111328563) Force nanopb first to work around ODR violations + protobuf-nanopb + firebase_firestore_model firebase_firestore_nanopb firebase_firestore_protos_nanopb firebase_firestore_util grpc::grpc - protobuf-nanopb ) -- cgit v1.2.3