From 3722deff12ec2e79c479ceae3a829752f92bb710 Mon Sep 17 00:00:00 2001
From: Gil <mcg@google.com>
Date: Tue, 26 Jun 2018 15:05:28 -0700
Subject: Install protobuf during CMake build (#1460)

* Install protobuf

  * Use the built-in FindProtobuf.cmake
  * Add additional build configuration flags
  * Preserve generator configuration in the protobuf sub-build

    Without this, the build fails on Win64 because the default
    configuration builds a Win32 libprotobuf and the Win64 build rejects
    it.
  * Wire the installed protobuf into the gRPC build.

* Install nanopb
---
 cmake/FindNanopb.cmake | 2 --
 1 file changed, 2 deletions(-)

(limited to 'cmake/FindNanopb.cmake')

diff --git a/cmake/FindNanopb.cmake b/cmake/FindNanopb.cmake
index eb7dfad..131be2a 100644
--- a/cmake/FindNanopb.cmake
+++ b/cmake/FindNanopb.cmake
@@ -18,13 +18,11 @@ set(BINARY_DIR ${FIREBASE_BINARY_DIR}/external/nanopb)
 
 find_path(
   NANOPB_INCLUDE_DIR pb.h
-  HINTS ${BINARY_DIR}/src/nanopb
 )
 
 find_library(
   NANOPB_LIBRARY
   NAMES protobuf-nanopb protobuf-nanopbd
-  HINTS ${BINARY_DIR}/src/nanopb-build
 )
 
 find_package_handle_standard_args(
-- 
cgit v1.2.3