Skip to content

Commit ba21413

Browse files
committed
update gRPC dependencies
1 parent b71bab5 commit ba21413

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,6 @@ if(WITH_OTLP_GRPC)
257257
find_package(re2 REQUIRED)
258258
if(WIN32)
259259
find_package(openssl REQUIRED)
260-
elseif(UNIX AND NOT APPLE AND NOT CYGWIN)
261-
find_package(upb REQUIRED)
262260
endif()
263261
endif()
264262

@@ -402,8 +400,7 @@ if(UNIX AND NOT APPLE AND NOT CYGWIN)
402400
"${OTEL_CPP_PREFIX}/lib/libopentelemetry_logs.a"
403401
"${OTEL_CPP_PREFIX}/lib/libopentelemetry_common.a"
404402
"${OTEL_CPP_PREFIX}/lib/libopentelemetry_otlp_recordable.a"
405-
${ABSL_LIBRARIES}
406-
${UPB_LIBRARIES} -Wl,--no-whole-archive)
403+
${ABSL_LIBRARIES} -Wl,--no-whole-archive)
407404
target_link_options(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE ${OPENTELEMETRY_PROXY_LINK_OPTIONS})
408405
elseif(APPLE)
409406
set_target_properties(${OPENTELEMETRY_PROXY_LIBRARY_NAME} PROPERTIES INSTALL_RPATH "@executable_path")

vcpkg.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
"abseil",
2121
"c-ares",
2222
"re2",
23-
"openssl",
24-
"upb"
23+
"openssl"
2524
]
2625
}
2726
},

0 commit comments

Comments
 (0)