Skip to content

Commit 1bff200

Browse files
authored
Fix cmake find config of fluentd and update corresponding README (open-telemetry#478)
1 parent 762057a commit 1bff200

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

exporters/fluentd/README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,21 @@ For example:
3434
$ .../opentelemetry-cpp-contrib2/exporters/fluentd$ make
3535
```
3636

37+
### Incorporating into an existing CMake Project
38+
39+
To use the library from a CMake project, you can locate it directly with
40+
`find_package` and use the imported targets from generated package
41+
configurations. As of now, this will import targets for both `trace` and `logs`.
42+
43+
```cmake
44+
# CMakeLists.txt
45+
find_package(opentelemetry-cpp CONFIG REQUIRED)
46+
find_package(opentelemetry-fluentd CONFIG REQUIRED)
47+
...
48+
target_include_directories(foo PRIVATE ${OPENTELEMETRY_CPP_FLUENTD_INCLUDE_DIRS})
49+
target_link_libraries(foo PRIVATE ${OPENTELEMETRY_CPP_LIBRARIES} ${OPENTELEMETRY_CPP_FLUENTD_LIBRARY_DIRS})
50+
```
51+
3752
### Bazel Install Instructions
3853

3954
TODO

exporters/fluentd/cmake/opentelemetry-cpp-fluentd-config.cmake.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
# OPENTELEMETRY_CPP_FLUENTD_VERSION - Version of opentelemetry-cpp-fluentd.
2020
#
2121
# ::
22-
# opentelemetry-cpp-fluentd::trace - Imported target of opentelemetry-cpp-fluentd::trace
23-
# opentelemetry-cpp::logs - Imported target of opentelemetry-cpp-fluentd::logs
22+
# opentelemetry-cpp-fluentd::trace - Imported target of opentelemetry-fluentd::trace
23+
# opentelemetry-cpp::logs - Imported target of opentelemetry-fluentd::logs
2424

2525
# =============================================================================
2626
# Copyright 2020 opentelemetry.
@@ -49,8 +49,8 @@ set(_OPENTELEMETRY_CPP_FLUENTD_LIBRARIES_TEST_TARGETS
4949
logs)
5050

5151
foreach(_TEST_TARGET IN LISTS _OPENTELEMETRY_CPP_FLUENTD_LIBRARIES_TEST_TARGETS)
52-
if(TARGET opentelemetry-fluentd-cpp::${_TEST_TARGET})
53-
list(APPEND OPENTELEMETRY_CPP_FLUENTD_LIBRARIES opentelemetry-cpp-fluentd::${_TEST_TARGET})
52+
if(TARGET opentelemetry-fluentd::${_TEST_TARGET})
53+
list(APPEND OPENTELEMETRY_CPP_FLUENTD_LIBRARIES opentelemetry-fluentd::${_TEST_TARGET})
5454
else()
5555
message("Target not found: " ${_TEST_TARGET})
5656
endif()

0 commit comments

Comments
 (0)