Skip to content

Commit 395b18d

Browse files
ThomsonTanThomsonTan
authored
[Geneva] Make EXPORT_NAME consistent (open-telemetry#553)
1 parent f6df898 commit 395b18d

File tree

4 files changed

+68
-71
lines changed

4 files changed

+68
-71
lines changed

‎exporters/fluentd/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ endif()
6363
# create fluentd trace exporter
6464
add_library(opentelemetry_exporter_geneva_trace src/trace/fluentd_exporter.cc
6565
src/trace/recordable.cc)
66+
set_target_properties(
67+
opentelemetry_exporter_geneva_trace
68+
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace)
69+
6670
if(MAIN_PROJECT)
6771
target_include_directories(opentelemetry_exporter_geneva_trace
6872
PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS})
@@ -83,6 +87,10 @@ endif()
8387

8488
add_library(opentelemetry_exporter_geneva_logs src/log/fluentd_exporter.cc
8589
src/log/recordable.cc)
90+
set_target_properties(
91+
opentelemetry_exporter_geneva_logs
92+
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs)
93+
8694
if(MAIN_PROJECT)
8795
target_include_directories(opentelemetry_exporter_geneva_logs
8896
PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS})
@@ -132,14 +140,6 @@ if(OPENTELEMETRY_INSTALL)
132140
FILES_MATCHING
133141
PATTERN "*.h")
134142
else()
135-
set_target_properties(
136-
opentelemetry_exporter_geneva_trace
137-
PROPERTIES
138-
EXPORT_NAME opentelemetry_exporter_geneva_trace)
139-
set_target_properties(
140-
opentelemetry_exporter_geneva_logs
141-
PROPERTIES
142-
EXPORT_NAME opentelemetry_exporter_geneva_logs)
143143
otel_add_component(
144144
COMPONENT
145145
exporters_geneva_fluentd

‎exporters/geneva-trace/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,19 @@ target_include_directories(
1717
opentelemetry_exporter_geneva_trace INTERFACE
1818
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
1919
$<INSTALL_INTERFACE:include>)
20+
set_target_properties(
21+
opentelemetry_exporter_geneva_trace
22+
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_trace)
2023

2124
add_library(opentelemetry_exporter_geneva_logs INTERFACE)
2225
target_include_directories(
2326
opentelemetry_exporter_geneva_logs INTERFACE
2427
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
2528
$<INSTALL_INTERFACE:include>)
29+
set_target_properties(
30+
opentelemetry_exporter_geneva_logs
31+
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_logs)
32+
2633

2734
if(WITH_EXAMPLES)
2835
include_directories(include)
@@ -44,13 +51,6 @@ if(OPENTELEMETRY_INSTALL)
4451
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
4552
endif()
4653
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)
53-
5454
otel_add_component(
5555
COMPONENT
5656
exporters_geneva_trace_logs
@@ -60,7 +60,7 @@ if(OPENTELEMETRY_INSTALL)
6060
FILES_DIRECTORY
6161
"include/opentelemetry/exporters/geneva"
6262
FILES_DESTINATION
63-
"include/opentelemetry/exporters/geneva"
63+
"include/opentelemetry/exporters"
6464
FILES_MATCHING
6565
PATTERN
6666
"*.h")

‎exporters/geneva/CMakeLists.txt‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ else()
4444
src/exporter.cc src/unix_domain_socket_data_transport.cc)
4545
endif()
4646

47+
set_target_properties(
48+
opentelemetry_exporter_geneva_metrics
49+
PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_metrics)
50+
4751
if(MAIN_PROJECT)
4852
target_include_directories(opentelemetry_exporter_geneva_metrics
4953
PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS})
@@ -91,40 +95,33 @@ if(BUILD_TESTING)
9195
endif()
9296

9397
if(OPENTELEMETRY_INSTALL)
94-
95-
if(MAIN_PROJECT)
96-
97-
install(
98-
TARGETS opentelemetry_exporter_geneva_metrics
99-
EXPORT "${PROJECT_NAME}-target"
100-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
101-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
102-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
103-
104-
install(
105-
DIRECTORY include/opentelemetry/exporters/geneva
106-
DESTINATION include/opentelemetry/exporters
107-
FILES_MATCHING
108-
PATTERN "*.h")
109-
110-
else()
111-
112-
set_target_properties(opentelemetry_exporter_geneva_metrics PROPERTIES EXPORT_NAME opentelemetry_exporter_geneva_metrics)
113-
114-
otel_add_component(
115-
COMPONENT
116-
exporters_geneva_metrics
117-
TARGETS
118-
opentelemetry_exporter_geneva_metrics
119-
FILES_DIRECTORY
120-
"include/opentelemetry/exporters/geneva"
121-
FILES_DESTINATION
122-
"include/opentelemetry/exporters"
123-
FILES_MATCHING
124-
PATTERN
125-
"*.h")
126-
127-
endif()
98+
if(MAIN_PROJECT)
99+
install(
100+
TARGETS opentelemetry_exporter_geneva_metrics
101+
EXPORT "${PROJECT_NAME}-target"
102+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
103+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
104+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
105+
106+
install(
107+
DIRECTORY include/opentelemetry/exporters/geneva
108+
DESTINATION include/opentelemetry/exporters
109+
FILES_MATCHING
110+
PATTERN "*.h")
111+
else()
112+
otel_add_component(
113+
COMPONENT
114+
exporters_geneva_metrics
115+
TARGETS
116+
opentelemetry_exporter_geneva_metrics
117+
FILES_DIRECTORY
118+
"include/opentelemetry/exporters/geneva"
119+
FILES_DESTINATION
120+
"include/opentelemetry/exporters"
121+
FILES_MATCHING
122+
PATTERN
123+
"*.h")
124+
endif()
128125
endif()
129126

130127
if(WITH_EXAMPLES)

‎exporters/user_events/CMakeLists.txt‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -136,29 +136,29 @@ if(WITH_BENCHMARK)
136136
opentelemetry_exporter_user_events_logs)
137137
endif()
138138

139-
if(MAIN_PROJECT)
139+
set_target_properties(
140+
opentelemetry_exporter_user_events_logs
141+
PROPERTIES
142+
EXPORT_NAME opentelemetry_exporter_user_events_logs)
143+
set_target_properties(
144+
opentelemetry_exporter_user_events_metrics
145+
PROPERTIES
146+
EXPORT_NAME opentelemetry_exporter_user_events_metrics)
140147

141-
install(
142-
TARGETS opentelemetry_exporter_user_events_logs
143-
EXPORT "${PROJECT_NAME}-target"
144-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
145-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
146-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
147-
148-
install(
149-
DIRECTORY include/opentelemetry/exporters/user_events
150-
DESTINATION include/opentelemetry/exporters
151-
FILES_MATCHING
152-
PATTERN "*.h")
148+
if(MAIN_PROJECT)
149+
install(
150+
TARGETS opentelemetry_exporter_user_events_logs
151+
EXPORT "${PROJECT_NAME}-target"
152+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
153+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
154+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
155+
156+
install(
157+
DIRECTORY include/opentelemetry/exporters/user_events
158+
DESTINATION include/opentelemetry/exporters
159+
FILES_MATCHING
160+
PATTERN "*.h")
153161
else()
154-
set_target_properties(
155-
opentelemetry_exporter_user_events_logs
156-
PROPERTIES
157-
EXPORT_NAME opentelemetry_exporter_user_events_logs)
158-
set_target_properties(
159-
opentelemetry_exporter_user_events_metrics
160-
PROPERTIES
161-
EXPORT_NAME opentelemetry_exporter_user_events_metrics)
162162
otel_add_component(
163163
COMPONENT
164164
exporters_user_events

0 commit comments

Comments
 (0)