Skip to content

Commit 627daec

Browse files
committed
Guard otel_add_component in non MAIN_PROJECT for fluentd exporter
1 parent 4cd1240 commit 627daec

File tree

1 file changed

+31
-29
lines changed

1 file changed

+31
-29
lines changed

exporters/geneva-trace/CMakeLists.txt

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,37 +30,39 @@ if(WITH_EXAMPLES)
3030
endif()
3131

3232
if(OPENTELEMETRY_INSTALL)
33-
install(DIRECTORY include/ DESTINATION include)
33+
if(MAIN_PROJECT)
34+
install(DIRECTORY include/ DESTINATION include)
3435

35-
install(
36-
TARGETS opentelemetry_exporter_geneva_trace opentelemetry_exporter_geneva_logs
37-
EXPORT "${PROJECT_NAME}-target")
38-
39-
if(NOT MAIN_PROJECT)
4036
install(
41-
EXPORT "${PROJECT_NAME}-target"
42-
NAMESPACE "${PROJECT_NAME}::"
43-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
44-
endif()
37+
TARGETS opentelemetry_exporter_geneva_trace opentelemetry_exporter_geneva_logs
38+
EXPORT "${PROJECT_NAME}-target")
4539

46-
set_target_properties(
47-
opentelemetry_exporter_geneva_trace
48-
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace)
49-
set_target_properties(
50-
opentelemetry_exporter_geneva_logs
51-
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs)
40+
if(NOT MAIN_PROJECT)
41+
install(
42+
EXPORT "${PROJECT_NAME}-target"
43+
NAMESPACE "${PROJECT_NAME}::"
44+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
45+
endif()
46+
else()
47+
set_target_properties(
48+
opentelemetry_exporter_geneva_trace
49+
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace)
50+
set_target_properties(
51+
opentelemetry_exporter_geneva_logs
52+
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs)
5253

53-
otel_add_component(
54-
COMPONENT
55-
exporters_geneva_trace_logs
56-
TARGETS
57-
opentelemetry_exporter_geneva_trace
58-
opentelemetry_exporter_geneva_logs
59-
FILES_DIRECTORY
60-
"include/opentelemetry/exporters/geneva"
61-
FILES_DESTINATION
62-
"include/opentelemetry/exporters/geneva"
63-
FILES_MATCHING
64-
PATTERN
65-
"*.h")
54+
otel_add_component(
55+
COMPONENT
56+
exporters_geneva_trace_logs
57+
TARGETS
58+
opentelemetry_exporter_geneva_trace
59+
opentelemetry_exporter_geneva_logs
60+
FILES_DIRECTORY
61+
"include/opentelemetry/exporters/geneva"
62+
FILES_DESTINATION
63+
"include/opentelemetry/exporters/geneva"
64+
FILES_MATCHING
65+
PATTERN
66+
"*.h")
67+
endif()
6668
endif()

0 commit comments

Comments
 (0)