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

Do not build protobuf twice

Browse Source
This commit is contained in:
Alexey Milovidov 2021-11-25 01:50:54 +03:00
parent 3ce2d4f38f
commit 05349ce7a6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/add_warning.cmake
View File

@ -12,13 +12,13 @@ macro (add_warning flag)
if (SUPPORTS_CXXFLAG_${underscored_flag}) if (SUPPORTS_CXXFLAG_${underscored_flag})
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W${flag}") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W${flag}")
else () else ()
message (WARNING "Flag -W${flag} is unsupported") message (STATUS "Flag -W${flag} is unsupported")
endif () endif ()
if (SUPPORTS_CFLAG_${underscored_flag}) if (SUPPORTS_CFLAG_${underscored_flag})
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W${flag}") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W${flag}")
else () else ()
message (WARNING "Flag -W${flag} is unsupported") message (STATUS "Flag -W${flag} is unsupported")
endif () endif ()
endmacro () endmacro ()
@ -39,7 +39,7 @@ macro (target_add_warning target flag)
if (SUPPORTS_CXXFLAG_${underscored_flag}) if (SUPPORTS_CXXFLAG_${underscored_flag})
target_compile_options (${target} PRIVATE "-W${flag}") target_compile_options (${target} PRIVATE "-W${flag}")
else () else ()
message (WARNING "Flag -W${flag} is unsupported") message (STATUS "Flag -W${flag} is unsupported")
endif () endif ()
endmacro () endmacro ()

4
contrib/protobuf-cmake/CMakeLists.txt
View File

@ -211,7 +211,9 @@ add_library(protobuf::libprotoc ALIAS libprotoc)
set(protoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/main.cc) set(protoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/main.cc)
if (NOT CMAKE_CROSSCOMPILING) if (CMAKE_HOST_SYSTEM_NAME STREQUAL CMAKE_SYSTEM_NAME
AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR)
add_executable(protoc ${protoc_files}) add_executable(protoc ${protoc_files})
target_link_libraries(protoc libprotoc libprotobuf pthread) target_link_libraries(protoc libprotoc libprotobuf pthread)
add_executable(protobuf::protoc ALIAS protoc) add_executable(protobuf::protoc ALIAS protoc)