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/external/protobuf.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmake/external/protobuf.cmake')

diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake
index a6ad8f0..2cc632c 100644
--- a/cmake/external/protobuf.cmake
+++ b/cmake/external/protobuf.cmake
@@ -67,7 +67,7 @@ if(CMAKE_VERSION VERSION_LESS "3.7")
   list(
     APPEND configure
     ${cmake_args}
-    "${PROJECT_BINARY_DIR}/external/protobuf/src/protobuf/cmake"
+    "${PROJECT_BINARY_DIR}/src/protobuf/cmake"
   )
 
   # Compose BUILD_COMMAND and INSTALL_COMMAND
@@ -104,7 +104,7 @@ ExternalProject_Add(
   URL https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz
   URL_HASH SHA256=56b5d9e1ab2bf4f5736c4cfba9f4981fbc6976246721e7ded5602fbaee6d6869
 
-  PREFIX ${PROJECT_BINARY_DIR}/external/protobuf
+  PREFIX ${PROJECT_BINARY_DIR}
   INSTALL_DIR ${FIREBASE_INSTALL_DIR}
 
   ${commands}
-- 
cgit v1.2.3