File tree Expand file tree Collapse file tree 14 files changed +16
-21
lines changed
w3c_tracecontext_http_test_server Expand file tree Collapse file tree 14 files changed +16
-21
lines changed Original file line number Diff line number Diff line change @@ -55,6 +55,9 @@ Increment the:
5555* [ CMAKE] Add generated protobuf headers to the opentelemetry_proto target
5656 [ #3400 ] ( https://github.com/open-telemetry/opentelemetry-cpp/pull/3400 )
5757
58+ * [ CMAKE] Remove include_directories usage and rely on target properties
59+ [ #3426 ] ( https://github.com/open-telemetry/opentelemetry-cpp/pull/3426 )
60+
5861## [ 1.20 2025-04-01]
5962
6063* [ BUILD] Update opentelemetry-proto version
Original file line number Diff line number Diff line change @@ -859,8 +859,6 @@ if(DEFINED OPENTELEMETRY_BUILD_DLL)
859859 add_definitions (-DOPENTELEMETRY_BUILD_EXPORT_DLL)
860860endif ()
861861
862- include_directories (api/include )
863-
864862add_subdirectory (api)
865863
866864if (WITH_OPENTRACING)
@@ -893,9 +891,6 @@ endif()
893891
894892if (NOT WITH_API_ONLY)
895893 set (BUILD_TESTING ${BUILD_TESTING} )
896- include_directories (sdk/include )
897- include_directories (sdk)
898- include_directories (ext /include )
899894
900895 add_subdirectory (sdk)
901896 add_subdirectory (ext )
Original file line number Diff line number Diff line change 22// SPDX-License-Identifier: Apache-2.0
33
44#include " opentelemetry/nostd/shared_ptr.h"
5- #include " opentelemetry/sdk/version/version.h"
65#include " opentelemetry/trace/provider.h"
76#include " opentelemetry/trace/scope.h"
87#include " opentelemetry/trace/tracer.h"
@@ -16,7 +15,7 @@ namespace
1615nostd::shared_ptr<trace::Tracer> get_tracer ()
1716{
1817 auto provider = trace::Provider::GetTracerProvider ();
19- return provider->GetTracer (" foo_library" , OPENTELEMETRY_SDK_VERSION );
18+ return provider->GetTracer (" foo_library" );
2019}
2120
2221void f1 ()
Original file line number Diff line number Diff line change 55#include " opentelemetry/logs/logger_provider.h"
66#include " opentelemetry/logs/provider.h"
77#include " opentelemetry/nostd/shared_ptr.h"
8- #include " opentelemetry/sdk/version/version.h"
98#include " opentelemetry/trace/provider.h"
109#include " opentelemetry/trace/scope.h"
1110#include " opentelemetry/trace/span.h"
@@ -21,7 +20,7 @@ namespace
2120opentelemetry::nostd::shared_ptr<trace::Tracer> get_tracer ()
2221{
2322 auto provider = trace::Provider::GetTracerProvider ();
24- return provider->GetTracer (" foo_library" , OPENTELEMETRY_SDK_VERSION );
23+ return provider->GetTracer (" foo_library" );
2524}
2625
2726opentelemetry::nostd::shared_ptr<logs::Logger> get_logger ()
Original file line number Diff line number Diff line change 11# Copyright The OpenTelemetry Authors
22# SPDX-License-Identifier: Apache-2.0
33
4- include_directories (include )
54if (NOT TARGET prometheus-cpp::core)
65 find_package (prometheus-cpp CONFIG REQUIRED)
76endif ()
Original file line number Diff line number Diff line change 11# Copyright The OpenTelemetry Authors
22# SPDX-License-Identifier: Apache-2.0
33
4- include_directories (include )
5- add_definitions (-DWITH_CURL)
64add_library (
75 opentelemetry_exporter_zipkin_trace
86 src/zipkin_exporter.cc src/zipkin_exporter_factory.cc src/recordable.cc)
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ if(WITH_HTTP_CLIENT_CURL)
2222 target_link_libraries (${FILENAME} opentelemetry_http_client_curl
2323 opentelemetry_common ${CURL_IMPORTED_TARGET_NAME} )
2424 else ()
25- include_directories ( ${CURL_INCLUDE_DIRS} )
25+ target_include_directories ( ${FILENAME} PRIVATE ${CURL_INCLUDE_DIRS} )
2626 target_link_libraries (${FILENAME} ${CURL_LIBRARIES}
2727 opentelemetry_http_client_curl opentelemetry_common)
2828 endif ()
@@ -35,7 +35,7 @@ endif()
3535
3636set (URL_PARSER_FILENAME url_parser_test)
3737add_executable (${URL_PARSER_FILENAME} ${URL_PARSER_FILENAME} .cc)
38- target_link_libraries (${URL_PARSER_FILENAME} opentelemetry_api ${GMOCK_LIB}
38+ target_link_libraries (${URL_PARSER_FILENAME} opentelemetry_ext ${GMOCK_LIB}
3939 ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )
4040gtest_add_tests(
4141 TARGET ${URL_PARSER_FILENAME}
Original file line number Diff line number Diff line change 11# Copyright The OpenTelemetry Authors
22# SPDX-License-Identifier: Apache-2.0
33
4- include_directories (${CMAKE_SOURCE_DIR} /exporters/ostream/include )
5-
64add_executable (w3c_tracecontext_http_test_server main.cc)
75target_link_libraries (
86 w3c_tracecontext_http_test_server
Original file line number Diff line number Diff line change 11# Copyright The OpenTelemetry Authors
22# SPDX-License-Identifier: Apache-2.0
33
4- include_directories (${CMAKE_SOURCE_DIR} /exporters/otlp/include )
5-
64if (WITH_OTLP_GRPC)
75 add_executable (func_otlp_grpc func_grpc_main.cc)
86 target_link_libraries (func_otlp_grpc ${CMAKE_THREAD_LIBS_INIT}
Original file line number Diff line number Diff line change @@ -9,6 +9,9 @@ target_include_directories(
99
1010set_target_properties (opentelemetry_sdk PROPERTIES EXPORT_NAME sdk)
1111
12+ target_link_libraries (opentelemetry_sdk INTERFACE opentelemetry_api)
13+
14+ set (OTEL_SDK_DIR ${CMAKE_CURRENT_SOURCE_DIR} )
1215add_subdirectory (src)
1316
1417otel_add_component(
You can’t perform that action at this time.
0 commit comments