diff options
| author |  Gil <mcg@google.com> | 2018-06-26 15:05:28 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-26 15:05:28 -0700 |
| commit | 3722deff12ec2e79c479ceae3a829752f92bb710 (patch) | |
| tree | b9d779ffe5ead20ffebf988c7f115b35fde428eb /cmake/FindNanopb.cmake | |
| parent | d03050653ff84e624def93aa512ef35907f5792a (diff) | |
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
Diffstat (limited to 'cmake/FindNanopb.cmake')
| -rw-r--r-- | cmake/FindNanopb.cmake | 2 |
1 files changed, 0 insertions, 2 deletions
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( |