aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Firestore/CMakeLists.txt3
-rw-r--r--Firestore/Protos/CMakeLists.txt7
2 files changed, 7 insertions, 3 deletions
diff --git a/Firestore/CMakeLists.txt b/Firestore/CMakeLists.txt
index 28ac08f..d605411 100644
--- a/Firestore/CMakeLists.txt
+++ b/Firestore/CMakeLists.txt
@@ -64,8 +64,5 @@ include_directories(${FIREBASE_INSTALL_DIR})
# Fully qualified imports, project wide
include_directories(${FIREBASE_SOURCE_DIR})
-# Include nanopb generated sources
-include_directories(${FIREBASE_SOURCE_DIR}/Firestore/Protos/nanopb)
-
add_subdirectory(core)
add_subdirectory(Protos)
diff --git a/Firestore/Protos/CMakeLists.txt b/Firestore/Protos/CMakeLists.txt
index f20f702..de33491 100644
--- a/Firestore/Protos/CMakeLists.txt
+++ b/Firestore/Protos/CMakeLists.txt
@@ -43,3 +43,10 @@ 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
+)