diff options
| author |  Gil <mcg@google.com> | 2018-07-16 08:50:53 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-16 08:50:53 -0700 |
| commit | cda87fa3afdacf20a097cf6ed90c5c2ef64e0437 (patch) | |
| tree | aeda6e64b1b925b7bb8a5dc8189d3c35efa31c4a /cmake/external/zlib.cmake | |
| parent | e963b606f3e90033086e08c1b989153467015ecd (diff) | |
Convert grpc and protobuf CMake builds to add_subdirectory (#1537)
* Build zlib with grpc's add_subdirectory
* Build grpc and its children with add_subdirectory.
* Build c-ares with grpc's add_subdirectory
* Convert protobuf to a download-only ExternalProject
* Temporarily break protobuf within grpc
This works because libgrpc has no actual dependency on protobuf
* Update boringssl to master@{2018-07-10}
Diffstat (limited to 'cmake/external/zlib.cmake')
| -rw-r--r-- | cmake/external/zlib.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cmake/external/zlib.cmake b/cmake/external/zlib.cmake index 70efa6b..7f86d96 100644 --- a/cmake/external/zlib.cmake +++ b/cmake/external/zlib.cmake @@ -27,6 +27,8 @@ endif() ExternalProject_Add( zlib + DEPENDS + grpc-download DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR} DOWNLOAD_NAME zlib-v1.2.11.tar.gz @@ -34,11 +36,10 @@ ExternalProject_Add( URL_HASH SHA256=629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff PREFIX ${PROJECT_BINARY_DIR} + SOURCE_DIR ${PROJECT_BINARY_DIR}/src/grpc/third_party/zlib - CMAKE_ARGS - -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} - -DCMAKE_INSTALL_PREFIX:STRING=${FIREBASE_INSTALL_DIR} - -DBUILD_SHARED_LIBS:BOOL=OFF - - TEST_COMMAND "" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" ) |