aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firestore/core
diff options
context:
space:
mode:
authorGravatar Gil <mcg@google.com>2018-07-13 11:09:44 -0700
committerGravatar GitHub <noreply@github.com>2018-07-13 11:09:44 -0700
commitfb9f24eaee4c57d09ec0dca32abff840b39f7c7e (patch)
tree95bde20bd905b2a2647ff60c09435526070cac9a /Firestore/core
parent855a7665aef505db456aa1c6f1cb9ea2b68056da (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/core')
-rw-r--r--Firestore/core/src/firebase/firestore/local/CMakeLists.txt4
-rw-r--r--Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt4
-rw-r--r--Firestore/core/src/firebase/firestore/remote/CMakeLists.txt4
3 files changed, 9 insertions, 3 deletions
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
)