diff --git a/CMakeLists.txt b/CMakeLists.txt index 43fa8f6d97..8c28c3fc32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3345,16 +3345,6 @@ add_library(grpc_unsecure src/core/util/json/json_object_loader.cc src/core/util/json/json_reader.cc src/core/util/json/json_writer.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/encode.c - third_party/upb/upb/wire/eps_copy_input_stream.c - third_party/upb/upb/wire/internal/decode_fast.c - third_party/upb/upb/wire/reader.c ${gRPC_ADDITIONAL_DLL_SRC} ) @@ -3593,7 +3583,7 @@ target_link_libraries(gtest endif() - +if(0) add_library(upb_base_lib third_party/upb/upb/base/status.c ) @@ -3644,7 +3634,6 @@ if(gRPC_INSTALL) ) endif() - add_library(upb_json_lib ${_gRPC_STATIC_WIN32} third_party/upb/upb/json/decode.c third_party/upb/upb/json/encode.c @@ -3981,6 +3970,7 @@ if(gRPC_INSTALL) ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() +endif() if(gRPC_BUILD_TESTS) @@ -5416,16 +5406,6 @@ add_library(grpc_authorization_provider src/core/tsi/transport_security_grpc.cc src/core/util/json/json_reader.cc src/core/util/json/json_writer.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c - third_party/upb/upb/mini_descriptor/internal/encode.c - third_party/upb/upb/mini_descriptor/link.c - third_party/upb/upb/wire/decode.c - third_party/upb/upb/wire/encode.c - third_party/upb/upb/wire/eps_copy_input_stream.c - third_party/upb/upb/wire/internal/decode_fast.c - third_party/upb/upb/wire/reader.c ) target_compile_features(grpc_authorization_provider PUBLIC cxx_std_14) @@ -37649,9 +37629,9 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" - "libcares openssl re2 zlib" + "libcares openssl re2 zlib utf8_range" "-lgrpc" - "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" + "-laddress_sorting -lupb" "grpc.pc") # grpc_unsecure .pc file @@ -37660,9 +37640,9 @@ generate_pkgconfig( "high performance general RPC framework without SSL" "${gRPC_CORE_VERSION}" "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" - "libcares zlib" + "libcares zlib utf8_range" "-lgrpc_unsecure" - "-laddress_sorting -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" + "-laddress_sorting -lupb" "grpc_unsecure.pc") # grpc++ .pc file @@ -37671,9 +37651,9 @@ generate_pkgconfig( "C++ wrapper for gRPC" "${gRPC_CPP_VERSION}" "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc" - "libcares openssl re2 zlib" + "libcares openssl re2 zlib utf8_range" "-lgrpc++" - "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" + "-laddress_sorting -lupb" "grpc++.pc") # grpc++_unsecure .pc file @@ -37682,11 +37662,12 @@ generate_pkgconfig( "C++ wrapper for gRPC without SSL" "${gRPC_CPP_VERSION}" "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc_unsecure" - "libcares zlib" + "libcares zlib utf8_range" "-lgrpc++_unsecure" - "-laddress_sorting -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" + "-laddress_sorting -lupb" "grpc++_unsecure.pc") +if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN) # grpcpp_otel_plugin .pc file generate_pkgconfig( "gRPC++ OpenTelemetry Plugin" @@ -37697,3 +37678,4 @@ generate_pkgconfig( "-lgrpcpp_otel_plugin" "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" "grpcpp_otel_plugin.pc") +endif() diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in index d552e0bb4e..d40c07ce7a 100644 --- a/cmake/gRPCConfig.cmake.in +++ b/cmake/gRPCConfig.cmake.in @@ -9,6 +9,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) @_gRPC_FIND_ABSL@ @_gRPC_FIND_RE2@ @_gRPC_FIND_OPENTELEMETRY@ +@_gRPC_FIND_UPB@ # Targets include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) diff --git a/cmake/upb.cmake b/cmake/upb.cmake index 9156e5f48f..3cc7ad4005 100644 --- a/cmake/upb.cmake +++ b/cmake/upb.cmake @@ -14,7 +14,14 @@ set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb) -set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range") +set(_gRPC_UPB_INCLUDE_DIR "") set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-gen" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-gen") set(_gRPC_UPB_LIBRARIES upb) + +find_package(upb CONFIG REQUIRED) +set(_gRPC_FIND_UPB "find_dependency(upb CONFIG)") +add_library(upb_json_lib ALIAS upb::upb) +add_library(upb_textformat_lib ALIAS upb::upb) +add_library(upb_message_lib ALIAS upb::upb) +add_library(utf8_range_lib ALIAS utf8_range::utf8_range)