Skip to content

Commit

Permalink
Correct the usage mistake of OTELCPP_PROTO_TARGET_OPTIONS when merg…
Browse files Browse the repository at this point in the history
…ing.

Signed-off-by: owent <[email protected]>
  • Loading branch information
owent committed May 9, 2023
1 parent 0a18f46 commit 679b8cf
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions cmake/opentelemetry-proto.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,10 @@ else()
list(APPEND OTELCPP_PROTO_TARGET_OPTIONS STATIC)
endif()

list(APPEND OTELCPP_PROTO_TARGET_OPTIONS)

set(OPENTELEMETRY_PROTO_TARGETS opentelemetry_proto)
add_library(
opentelemetry_proto
${OTELCPP_PROTO_TARGET_OPTIONS}
${COMMON_PB_CPP_FILE}
${RESOURCE_PB_CPP_FILE}
${TRACE_PB_CPP_FILE}
Expand All @@ -255,8 +254,8 @@ add_library(
if(WITH_OTLP_GRPC)
add_library(
opentelemetry_proto_grpc
${TRACE_SERVICE_GRPC_PB_CPP_FILE} ${LOGS_SERVICE_GRPC_PB_CPP_FILE}
${METRICS_SERVICE_GRPC_PB_CPP_FILE})
${OTELCPP_PROTO_TARGET_OPTIONS} ${TRACE_SERVICE_GRPC_PB_CPP_FILE}
${LOGS_SERVICE_GRPC_PB_CPP_FILE} ${METRICS_SERVICE_GRPC_PB_CPP_FILE})

list(APPEND OPENTELEMETRY_PROTO_TARGETS opentelemetry_proto_grpc)
target_link_libraries(opentelemetry_proto_grpc PUBLIC opentelemetry_proto)
Expand Down

0 comments on commit 679b8cf

Please sign in to comment.