diff options
author | Gil <mcg@google.com> | 2018-06-26 15:05:28 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-26 15:05:28 -0700 |
commit | 3722deff12ec2e79c479ceae3a829752f92bb710 (patch) | |
tree | b9d779ffe5ead20ffebf988c7f115b35fde428eb /Firestore | |
parent | d03050653ff84e624def93aa512ef35907f5792a (diff) |
Install protobuf during CMake build (#1460)
* Install protobuf
* Use the built-in FindProtobuf.cmake
* Add additional build configuration flags
* Preserve generator configuration in the protobuf sub-build
Without this, the build fails on Win64 because the default
configuration builds a Win32 libprotobuf and the Win64 build rejects
it.
* Wire the installed protobuf into the gRPC build.
* Install nanopb
Diffstat (limited to 'Firestore')
-rw-r--r-- | Firestore/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Firestore/Protos/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Firestore/CMakeLists.txt b/Firestore/CMakeLists.txt index 1240a8d..d5027ce 100644 --- a/Firestore/CMakeLists.txt +++ b/Firestore/CMakeLists.txt @@ -80,9 +80,9 @@ include(utils) find_package(GTest REQUIRED) find_package(GMock REQUIRED) find_package(LevelDB REQUIRED) -find_package(GRPC REQUIRED) find_package(Nanopb REQUIRED) find_package(Protobuf REQUIRED) +find_package(GRPC REQUIRED) if(APPLE) find_package(FirebaseCore REQUIRED) diff --git a/Firestore/Protos/CMakeLists.txt b/Firestore/Protos/CMakeLists.txt index 5c0fda0..831b53d 100644 --- a/Firestore/Protos/CMakeLists.txt +++ b/Firestore/Protos/CMakeLists.txt @@ -82,7 +82,7 @@ cc_library( cpp/google/type/latlng.pb.cc cpp/google/type/latlng.pb.h DEPENDS - protobuf + protobuf::libprotobuf EXCLUDE_FROM_ALL ) |