diff options
| author |  Gil <mcg@google.com> | 2018-07-13 11:09:44 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-13 11:09:44 -0700 |
| commit | fb9f24eaee4c57d09ec0dca32abff840b39f7c7e (patch) | |
| tree | 95bde20bd905b2a2647ff60c09435526070cac9a /cmake/external/nanopb.cmake | |
| parent | 855a7665aef505db456aa1c6f1cb9ea2b68056da (diff) | |
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.
Diffstat (limited to 'cmake/external/nanopb.cmake')
| -rw-r--r-- | cmake/external/nanopb.cmake | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/cmake/external/nanopb.cmake b/cmake/external/nanopb.cmake index b341c36..50faa06 100644 --- a/cmake/external/nanopb.cmake +++ b/cmake/external/nanopb.cmake @@ -23,8 +23,6 @@ set(NANOPB_PROTOC_BIN ${FIREBASE_INSTALL_DIR}/bin/protoc) ExternalProject_Add( nanopb - DEPENDS - protobuf DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR} URL https://github.com/nanopb/nanopb/archive/nanopb-0.3.9.1.tar.gz @@ -32,12 +30,8 @@ ExternalProject_Add( PREFIX ${PROJECT_BINARY_DIR} - CMAKE_ARGS - -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} - -DCMAKE_INSTALL_PREFIX:STRING=${FIREBASE_INSTALL_DIR} - -DBUILD_SHARED_LIBS:BOOL=OFF - -Dnanopb_BUILD_GENERATOR:BOOL=ON - -Dnanopb_PROTOC_PATH:STRING=${NANOPB_PROTOC_BIN} - + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" TEST_COMMAND "" ) |