SHA256
1
0
forked from jengelh/grpc
grpc/grpc-zlib.diff

38 lines
1.2 KiB
Diff

[ 24s] CMakeFiles/grpc_unsecure.dir/src/core/lib/compression/message_compress.c.o: In function `zlib_compress':
[ 24s] /home/abuild/rpmbuild/BUILD/grpc-1.2.3/src/core/lib/compression/message_compress.c:112: undefined reference to `deflateInit2_'
---
CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: grpc-1.2.3/CMakeLists.txt
===================================================================
--- grpc-1.2.3.orig/CMakeLists.txt
+++ grpc-1.2.3/CMakeLists.txt
@@ -121,7 +121,7 @@ if("${gRPC_ZLIB_PROVIDER}" STREQUAL "mod
elseif("${gRPC_ZLIB_PROVIDER}" STREQUAL "package")
find_package(ZLIB)
if(TARGET ZLIB::ZLIB)
- set(_gRPC_ZLIB_LIBRARIES ZLIB::ZLIB)
+ set(_gRPC_ZLIB_LIBRARIES ${ZLIB_LIBRARIES})
endif()
set(_gRPC_FIND_ZLIB "if(NOT ZLIB_FOUND)\n find_package(ZLIB)\nendif()")
endif()
@@ -242,7 +242,7 @@ if(NOT MSVC)
endif()
if(UNIX)
- set(_gRPC_ALLTARGETS_LIBRARIES dl rt m pthread)
+ set(_gRPC_ALLTARGETS_LIBRARIES dl rt m pthread z)
endif()
if(WIN32 AND MSVC)
@@ -1392,6 +1392,7 @@ target_link_libraries(grpc_cronet
${_gRPC_BASELIB_LIBRARIES}
${_gRPC_SSL_LIBRARIES}
${_gRPC_ALLTARGETS_LIBRARIES}
+ ${ZLIB_LIBRARIES}
gpr
)