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/Protos/CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) (limited to 'Firestore/Protos') 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 -- cgit v1.2.3