From f873929ef1e8bf27cd363b58c7e1512579f4770a Mon Sep 17 00:00:00 2001 From: Oblivion Date: Sat, 30 Oct 2021 00:06:01 +0000 Subject: [PATCH] comments --- examples/CMakeLists.txt | 1 + examples/common/foo_library/BUILD | 2 +- examples/jaeger/CMakeLists.txt | 3 +-- examples/multi_processor/CMakeLists.txt | 6 ++---- examples/otlp/CMakeLists.txt | 1 - examples/simple/CMakeLists.txt | 3 +-- examples/zipkin/CMakeLists.txt | 3 +-- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 56dd515019..85db78a6e9 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,4 +1,5 @@ add_subdirectory(common) +include_directories(common) if(WITH_OTLP_GRPC OR WITH_OTLP_HTTP) add_subdirectory(otlp) add_subdirectory(grpc) diff --git a/examples/common/foo_library/BUILD b/examples/common/foo_library/BUILD index 51f9a2bb55..beffe5ca10 100644 --- a/examples/common/foo_library/BUILD +++ b/examples/common/foo_library/BUILD @@ -11,6 +11,6 @@ cc_library( defines = ["BAZEL_BUILD"], deps = [ "//api", - "//sdk/src/trace", + "//sdk:headers", ], ) diff --git a/examples/jaeger/CMakeLists.txt b/examples/jaeger/CMakeLists.txt index 46d320658f..713521c3a7 100644 --- a/examples/jaeger/CMakeLists.txt +++ b/examples/jaeger/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${CMAKE_SOURCE_DIR}/exporters/jaeger/include - ${CMAKE_SOURCE_DIR}/examples/common) +include_directories(${CMAKE_SOURCE_DIR}/exporters/jaeger/include) add_executable(example_jaeger main.cc) target_link_libraries( diff --git a/examples/multi_processor/CMakeLists.txt b/examples/multi_processor/CMakeLists.txt index edef5bb85a..a1e4ac9ea5 100644 --- a/examples/multi_processor/CMakeLists.txt +++ b/examples/multi_processor/CMakeLists.txt @@ -1,7 +1,5 @@ -include_directories( - ${CMAKE_SOURCE_DIR}/exporters/ostream/include - ${CMAKE_SOURCE_DIR}/exporters/memory/include - ${CMAKE_SOURCE_DIR}/examples/common) +include_directories(${CMAKE_SOURCE_DIR}/exporters/ostream/include + ${CMAKE_SOURCE_DIR}/exporters/memory/include) add_executable(example_multi_processor main.cc) target_link_libraries( diff --git a/examples/otlp/CMakeLists.txt b/examples/otlp/CMakeLists.txt index a9da661d94..4618695d3b 100644 --- a/examples/otlp/CMakeLists.txt +++ b/examples/otlp/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories( ${CMAKE_BINARY_DIR}/generated/third_party/opentelemetry-proto - ${CMAKE_SOURCE_DIR}/examples/common ${CMAKE_SOURCE_DIR}/exporters/otlp/include) if(WITH_OTLP_GRPC) diff --git a/examples/simple/CMakeLists.txt b/examples/simple/CMakeLists.txt index d70780f76b..4368039c1d 100644 --- a/examples/simple/CMakeLists.txt +++ b/examples/simple/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${CMAKE_SOURCE_DIR}/exporters/ostream/include - ${CMAKE_SOURCE_DIR}/examples/common) +include_directories(${CMAKE_SOURCE_DIR}/exporters/ostream/include) add_executable(example_simple main.cc) target_link_libraries( diff --git a/examples/zipkin/CMakeLists.txt b/examples/zipkin/CMakeLists.txt index 920127a38a..f55f363d72 100644 --- a/examples/zipkin/CMakeLists.txt +++ b/examples/zipkin/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${CMAKE_SOURCE_DIR}/exporters/zipkin/include - ${CMAKE_SOURCE_DIR}/examples/common) +include_directories(${CMAKE_SOURCE_DIR}/exporters/zipkin/include) add_executable(example_zipkin main.cc) target_link_libraries(