thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 08:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build scripts related to protobuf and gRPC for Mac.

Browse Source
This commit is contained in:
Vitaly Baranov 2020-05-29 23:09:01 +03:00
parent 393db8ff6c
commit 69afc13d55
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/protobuf_generate_cpp.cmake
View File

@ -55,6 +55,7 @@ function(protobuf_generate_cpp_impl SRCS HDRS MODES OUTPUT_FILE_EXTS PLUGIN)
endif() endif()
set (intermediate_dir ${CMAKE_CURRENT_BINARY_DIR}/intermediate) set (intermediate_dir ${CMAKE_CURRENT_BINARY_DIR}/intermediate)
file (MAKE_DIRECTORY ${intermediate_dir})
set (protoc_args) set (protoc_args)
foreach (mode ${MODES}) foreach (mode ${MODES})
@ -112,7 +113,7 @@ if (PROTOBUF_GENERATE_CPP_SCRIPT_MODE)
set (intermediate_dir ${DIR}/intermediate) set (intermediate_dir ${DIR}/intermediate)
set (intermediate_output "${intermediate_dir}/${FILENAME}") set (intermediate_output "${intermediate_dir}/${FILENAME}")
if (COMPILER_ID STREQUAL "Clang") if (COMPILER_ID MATCHES "Clang")
set (pragma_push "#pragma clang diagnostic push\n") set (pragma_push "#pragma clang diagnostic push\n")
set (pragma_pop "#pragma clang diagnostic pop\n") set (pragma_pop "#pragma clang diagnostic pop\n")
set (pragma_disable_warnings "#pragma clang diagnostic ignored \"-Weverything\"\n") set (pragma_disable_warnings "#pragma clang diagnostic ignored \"-Weverything\"\n")