diff options
| author |  Gil <mcg@google.com> | 2018-07-11 15:55:36 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-11 15:55:36 -0700 |
| commit | 7fc953fc6ffa69d159c0523d3902d867fe8c0ca5 (patch) | |
| tree | d8551a0c0d592f5937435819ca3d6e8c1bec72a9 /Firestore/Protos | |
| parent | e1ace703fbf4458d9e887ebf30050b1a0482a2d2 (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/Protos')
| -rw-r--r-- | Firestore/Protos/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Firestore/Protos/CMakeLists.txt b/Firestore/Protos/CMakeLists.txt index b347a61..fdf45e7 100644 --- a/Firestore/Protos/CMakeLists.txt +++ b/Firestore/Protos/CMakeLists.txt @@ -50,19 +50,19 @@ cc_library( nanopb/google/type/latlng.pb.c nanopb/google/type/latlng.nanopb.h DEPENDS - nanopb + protobuf-nanopb ) target_compile_definitions( - firebase_firestore_protos_nanopb PUBLIC - -DPB_FIELD_16BIT + 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 + firebase_firestore_protos_nanopb + PUBLIC ${FIREBASE_SOURCE_DIR}/Firestore/Protos/nanopb ) # libprotobuf based generated protos. Expected only to be used in test (as @@ -102,10 +102,10 @@ cc_library( target_include_directories( firebase_firestore_protos_libprotobuf PUBLIC - ${FIREBASE_SOURCE_DIR}/Firestore/Protos/cpp + ${FIREBASE_SOURCE_DIR}/Firestore/Protos/cpp ) set_target_properties( - firebase_firestore_protos_libprotobuf PROPERTIES - COMPILE_FLAGS "-Wno-unused-parameter" + firebase_firestore_protos_libprotobuf + PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter" ) |