thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-18 04:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

added zlib-ng instead zlib

Browse Source
This commit is contained in:
Aleksei Levushkin 2020-02-05 14:48:59 +03:00
parent 439ef6af9a
commit 2723057e80
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/grpc-cmake/CMakeLists.txt
View File

@ -15,8 +15,8 @@ endif()
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_gRPC_C_CXX_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_gRPC_C_CXX_FLAGS} -w")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_gRPC_C_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_gRPC_C_CXX_FLAGS} -w")
set(_gRPC_PROTOBUF_LIBRARY_NAME "libprotobuf") set(_gRPC_PROTOBUF_LIBRARY_NAME "libprotobuf")
@ -96,9 +96,9 @@ set(_gRPC_UPB_GRPC_GENERATED_DIR "${GRPC_SOURCE_DIR}/src/core/ext/upb-generated"
set(_gRPC_UPB_LIBRARIES upb) set(_gRPC_UPB_LIBRARIES upb)
# zlib.cmake # zlib.cmake
set(ZLIB_ROOT_DIR ${GRPC_SOURCE_DIR}/third_party/zlib) set(ZLIB_ROOT_DIR ${GRPC_SOURCE_DIR}/third_party/zlib-ng)
include_directories("${ZLIB_ROOT_DIR}") include_directories("${ZLIB_ROOT_DIR}")
add_subdirectory(${ZLIB_ROOT_DIR} ${ZLIB_ROOT_DIR}) # add_subdirectory(${ZLIB_ROOT_DIR} ${ZLIB_ROOT_DIR})
set(_gRPC_ZLIB_LIBRARIES zlibstatic) set(_gRPC_ZLIB_LIBRARIES zlibstatic)
set(_gRPC_ZLIB_INCLUDE_DIR "${ZLIB_ROOT_DIR}") set(_gRPC_ZLIB_INCLUDE_DIR "${ZLIB_ROOT_DIR}")
@ -1333,7 +1333,7 @@ add_library(grpc++
${GRPC_SOURCE_DIR}/src/cpp/codegen/codegen_init.cc ${GRPC_SOURCE_DIR}/src/cpp/codegen/codegen_init.cc
) )
target_compile_options(grpc++ PUBLIC -Wno-error=shadow) target_compile_options(grpc++ PUBLIC -w)
target_include_directories(grpc++ target_include_directories(grpc++
PUBLIC ${GRPC_INCLUDE_DIR} PUBLIC ${GRPC_INCLUDE_DIR}
@ -1406,7 +1406,7 @@ add_library(grpc++_unsecure
${GRPC_SOURCE_DIR}/src/cpp/codegen/codegen_init.cc ${GRPC_SOURCE_DIR}/src/cpp/codegen/codegen_init.cc
) )
target_compile_options(grpc++_unsecure PUBLIC -Wno-error=shadow) target_compile_options(grpc++_unsecure PUBLIC -w)
target_include_directories(grpc++_unsecure target_include_directories(grpc++_unsecure
PUBLIC ${GRPC_INCLUDE_DIR} PUBLIC ${GRPC_INCLUDE_DIR}