From fb9f24eaee4c57d09ec0dca32abff840b39f7c7e Mon Sep 17 00:00:00 2001
From: Gil <mcg@google.com>
Date: Fri, 13 Jul 2018 11:09:44 -0700
Subject: Convert googletest and nanopb CMake builds to add_subdirectory
 (#1522)

* Add a download-only boringssl ExternalProject

Match boringssl version to grpc submodule version

Note: not yet in use

* Split grpc into separate download and build tasks

This allows other external targets to download into the gRPC source tree
before grpc is actually built.

* Convert grpc to an http download

* Build googletest with add_subdirectory

Also:
  * Revert library-name modifications in the abseil-cpp build
  * Move abseil-cpp add_subdirectory build into place

* Build nanopb with add_subdirectory

* Force nanopb first to work around ODR violations

This is a temporary work-around for b/111328563.
---
 cmake/external/googletest.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/cmake/external/googletest.cmake b/cmake/external/googletest.cmake
index e2ebafc..32e9a39 100644
--- a/cmake/external/googletest.cmake
+++ b/cmake/external/googletest.cmake
@@ -28,8 +28,8 @@ ExternalProject_Add(
 
   PREFIX ${PROJECT_BINARY_DIR}
 
-  CMAKE_CACHE_ARGS
-    -DCMAKE_INSTALL_PREFIX:STRING=${FIREBASE_INSTALL_DIR}
-
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
   TEST_COMMAND ""
 )
-- 
cgit v1.2.3