aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firestore/core/src/firebase
diff options
context:
space:
mode:
authorGravatar Gil <mcg@google.com>2018-07-11 15:55:36 -0700
committerGravatar GitHub <noreply@github.com>2018-07-11 15:55:36 -0700
commit7fc953fc6ffa69d159c0523d3902d867fe8c0ca5 (patch)
treed8551a0c0d592f5937435819ca3d6e8c1bec72a9 /Firestore/core/src/firebase
parente1ace703fbf4458d9e887ebf30050b1a0482a2d2 (diff)
Firestore CMake cleanup (#1510)
* Pull out sanitizer options into a separate file * Reorder packages * Remove the extra "external/$target" directory from PREFIX Instead of BINARY_DIR/external/foo/src/foo the contents will be in BINARY_DIR/src/foo. * Make libprotobuf-nanopb targets line up with nanopb's CMakeLists.txt * Fix CMake style
Diffstat (limited to 'Firestore/core/src/firebase')
-rw-r--r--Firestore/core/src/firebase/firestore/local/CMakeLists.txt2
-rw-r--r--Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt2
-rw-r--r--Firestore/core/src/firebase/firestore/remote/CMakeLists.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/Firestore/core/src/firebase/firestore/local/CMakeLists.txt b/Firestore/core/src/firebase/firestore/local/CMakeLists.txt
index 3e009bb..5a47187 100644
--- a/Firestore/core/src/firebase/firestore/local/CMakeLists.txt
+++ b/Firestore/core/src/firebase/firestore/local/CMakeLists.txt
@@ -29,5 +29,5 @@ cc_library(
firebase_firestore_protos_nanopb
firebase_firestore_remote
firebase_firestore_util
- nanopb
+ protobuf-nanopb
)
diff --git a/Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt b/Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt
index 82ffb65..fd34c2e 100644
--- a/Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt
+++ b/Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt
@@ -23,5 +23,5 @@ cc_library(
DEPENDS
firebase_firestore_util
firebase_firestore_protos_nanopb
- nanopb
+ protobuf-nanopb
)
diff --git a/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt b/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt
index 0ef0b7c..a2bdbe2 100644
--- a/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt
+++ b/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt
@@ -27,5 +27,5 @@ cc_library(
firebase_firestore_protos_nanopb
firebase_firestore_util
grpc::grpc
- nanopb
+ protobuf-nanopb
)