-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update to otel-cpp 1.16.1, closes #146
- Loading branch information
Showing
8 changed files
with
31 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake | ||
index 22082356..e25a89a2 100644 | ||
index 62197068..150ce3fb 100644 | ||
--- a/cmake/opentelemetry-proto.cmake | ||
+++ b/cmake/opentelemetry-proto.cmake | ||
@@ -276,7 +276,7 @@ if(WITH_OTLP_GRPC) | ||
PUBLIC opentelemetry_proto) | ||
@@ -346,7 +346,7 @@ if(WITH_OTLP_GRPC) | ||
target_link_libraries(opentelemetry_proto_grpc PUBLIC opentelemetry_proto) | ||
|
||
get_target_property(grpc_lib_type gRPC::grpc++ TYPE) | ||
- if (grpc_lib_type STREQUAL "SHARED_LIBRARY") | ||
+ if (grpc_lib_type STREQUAL "SHARED_LIBRARY" OR APPLE) | ||
target_link_libraries(opentelemetry_proto_grpc | ||
PUBLIC gRPC::grpc++) | ||
- if(grpc_lib_type STREQUAL "SHARED_LIBRARY") | ||
+ if(grpc_lib_type STREQUAL "SHARED_LIBRARY" OR APPLE) | ||
target_link_libraries(opentelemetry_proto_grpc PUBLIC gRPC::grpc++) | ||
endif() | ||
set_target_properties(opentelemetry_proto_grpc PROPERTIES EXPORT_NAME |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters