From: LLVM Packaging Team Date: Sun, 1 Jan 2023 14:46:39 +0000 (+0000) Subject: link-grpc X-Git-Tag: archive/raspbian/1%16.0.6-15+rpi1~4^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e9b9209ab524eaa4f9bebac46e3ad0f929c1689a;p=llvm-toolchain-16.git link-grpc =================================================================== Gbp-Pq: Name link-grpc.diff --- diff --git a/llvm/cmake/modules/FindGRPC.cmake b/llvm/cmake/modules/FindGRPC.cmake index faaa968088..7068d9a8cb 100644 --- a/llvm/cmake/modules/FindGRPC.cmake +++ b/llvm/cmake/modules/FindGRPC.cmake @@ -82,11 +82,28 @@ else() endif() endif() if(NOT TARGET grpc++) + find_library(GPR_LIBRARY gpr $GRPC_OPTS REQUIRED) + add_library(gpr UNKNOWN IMPORTED GLOBAL) + message(STATUS "Using gpr: " ${GPR_LIBRARY}) + set_target_properties(gpr PROPERTIES IMPORTED_LOCATION ${GPR_LIBRARY}) + find_library(GRPC_LIBRARY grpc++ ${GRPC_OPTS} REQUIRED) add_library(grpc++ UNKNOWN IMPORTED GLOBAL) message(STATUS "Using grpc++: " ${GRPC_LIBRARY}) set_target_properties(grpc++ PROPERTIES IMPORTED_LOCATION ${GRPC_LIBRARY}) target_include_directories(grpc++ INTERFACE ${GRPC_INCLUDE_PATHS}) + find_library(GRPC2_LIBRARY grpc $GRPC_OPTS REQUIRED) + add_library(grpc UNKNOWN IMPORTED GLOBAL) + message(STATUS "Using grpc: " ${GRPC2_LIBRARY}) + set_target_properties(grpc PROPERTIES IMPORTED_LOCATION ${GRPC2_LIBRARY}) + + find_library(ABSL_SYNCHRONIZATION_LIBRARY absl_synchronization $GRPC_OPTS REQUIRED) + if (ABSL_SYNCHRONIZATION_LIBRARY) + add_library(absl_synchronization UNKNOWN IMPORTED GLOBAL) + message(STATUS "Using absl_synchronization: " ${ABSL_SYNCHRONIZATION_LIBRARY}) + set_target_properties(absl_synchronization PROPERTIES IMPORTED_LOCATION ${ABSL_SYNCHRONIZATION_LIBRARY}) + endif() + if (ENABLE_GRPC_REFLECTION) find_library(GRPC_REFLECTION_LIBRARY grpc++_reflection ${GRPC_OPTS} REQUIRED) add_library(grpc++_reflection UNKNOWN IMPORTED GLOBAL) @@ -132,9 +149,15 @@ function(generate_protos LibraryName ProtoFile) ARGS ${Flags} "${ProtoSourceAbsolutePath}" DEPENDS "${ProtoSourceAbsolutePath}") + set(LINKED_GRPC_LIBRARIES protobuf gpr grpc grpc++) + + if (ABSL_SYNCHRONIZATION_LIBRARY) + list(APPEND LINKED_GRPC_LIBRARIES absl_synchronization) + endif() + add_clang_library(${LibraryName} ${GeneratedProtoSource} PARTIAL_SOURCES_INTENDED - LINK_LIBS PUBLIC grpc++ protobuf) + LINK_LIBS PUBLIC ${LINKED_GRPC_LIBRARIES}) # Ensure dependency headers are generated before dependent protos are built. # DEPENDS arg is a list of "Foo.proto". While they're logically relative to