diff options
| author |  Gil <mcg@google.com> | 2018-06-28 11:28:43 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-28 11:28:43 -0700 |
| commit | bb9fd3136b189456606c8ece7ee1f2e9b1590e55 (patch) | |
| tree | 99f1550521684a180809778bd15f56cb11cd3f39 /cmake/external/grpc.cmake | |
| parent | 2f6bf8d6695170fe15bb95d2eca6d6b7e56add74 (diff) | |
Add an external build for zlib (#1473)
Diffstat (limited to 'cmake/external/grpc.cmake')
| -rw-r--r-- | cmake/external/grpc.cmake | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/cmake/external/grpc.cmake b/cmake/external/grpc.cmake index ee4d246..1e8388c 100644 --- a/cmake/external/grpc.cmake +++ b/cmake/external/grpc.cmake @@ -14,7 +14,6 @@ include(ExternalProject) include(ExternalProjectFlags) -include(FindZLIB) if(GRPC_ROOT) # If the user has supplied a GRPC_ROOT then just use it. Add an empty custom @@ -69,22 +68,19 @@ else() ## zlib - # zlib can be built by grpc but we can avoid it on platforms that provide it - # by default. - find_package(ZLIB) + # cmake/external/zlib.cmake figures out whether or not to build zlib. Either + # way, from the gRPC build's point of view it's a package. + list( + APPEND CMAKE_ARGS + -DgRPC_ZLIB_PROVIDER:STRING=package + ) if(ZLIB_FOUND) + # Propagate possible user configuration to FindZLIB.cmake in the sub-build. list( APPEND CMAKE_ARGS - -DgRPC_ZLIB_PROVIDER:STRING=package -DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR} -DZLIB_LIBRARY=${ZLIB_LIBRARY} ) - - else() - list( - APPEND GIT_SUBMODULES - third_party/zlib - ) endif() @@ -99,6 +95,7 @@ else() grpc DEPENDS protobuf + zlib ${GRPC_GIT} |