From 7fc953fc6ffa69d159c0523d3902d867fe8c0ca5 Mon Sep 17 00:00:00 2001
From: Gil <mcg@google.com>
Date: Wed, 11 Jul 2018 15:55:36 -0700
Subject: 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
---
 cmake/FindNanopb.cmake | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'cmake/FindNanopb.cmake')

diff --git a/cmake/FindNanopb.cmake b/cmake/FindNanopb.cmake
index 131be2a..e7a94bb 100644
--- a/cmake/FindNanopb.cmake
+++ b/cmake/FindNanopb.cmake
@@ -14,8 +14,6 @@
 
 include(FindPackageHandleStandardArgs)
 
-set(BINARY_DIR ${FIREBASE_BINARY_DIR}/external/nanopb)
-
 find_path(
   NANOPB_INCLUDE_DIR pb.h
 )
@@ -35,10 +33,10 @@ find_package_handle_standard_args(
 if(NANOPB_FOUND)
   set(NANOPB_INCLUDE_DIRS ${NANOPB_INCLUDE_DIR})
 
-  if (NOT TARGET nanopb)
-    add_library(nanopb UNKNOWN IMPORTED)
+  if (NOT TARGET protobuf-nanopb)
+    add_library(protobuf-nanopb UNKNOWN IMPORTED)
     set_target_properties(
-      nanopb PROPERTIES
+      protobuf-nanopb PROPERTIES
       INTERFACE_INCLUDE_DIRECTORIES ${NANOPB_INCLUDE_DIRS}
       IMPORTED_LOCATION ${NANOPB_LIBRARY}
     )
-- 
cgit v1.2.3