Skip to content

Commit

Permalink
Remove redundant tail / in CMake install (#1329)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThomsonTan
ThomsonTan authored Apr 16, 2022
1 parent defdfd2 commit 2e9b7a1
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 20 deletions.
2 changes: 1 addition & 1 deletion exporters/elasticsearch/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ install(

install(
DIRECTORY include/opentelemetry/exporters/elasticsearch
DESTINATION include/opentelemetry/exporters/
DESTINATION include/opentelemetry/exporters
FILES_MATCHING
PATTERN "*.h"
PATTERN "es_log_recordable.h" EXCLUDE)
Expand Down
2 changes: 1 addition & 1 deletion exporters/etw/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ install(

install(
DIRECTORY include/opentelemetry/exporters/etw
DESTINATION include/opentelemetry/exporters/
DESTINATION include/opentelemetry/exporters
FILES_MATCHING
PATTERN "*.h")

Expand Down
2 changes: 1 addition & 1 deletion exporters/jaeger/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ install(

install(
DIRECTORY include/opentelemetry/exporters/jaeger
DESTINATION include/opentelemetry/exporters/
DESTINATION include/opentelemetry/exporters
FILES_MATCHING
PATTERN "*.h"
PATTERN "recordable.h" EXCLUDE)
Expand Down
2 changes: 1 addition & 1 deletion exporters/memory/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install(

install(
DIRECTORY include/opentelemetry/exporters/memory
DESTINATION include/opentelemetry/exporters/
DESTINATION include/opentelemetry/exporters
FILES_MATCHING
PATTERN "*.h")

Expand Down
6 changes: 3 additions & 3 deletions exporters/ostream/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ install(

install(
DIRECTORY include/opentelemetry/exporters/ostream
DESTINATION include/opentelemetry/exporters/
DESTINATION include/opentelemetry/exporters
PATTERN "*.h"
PATTERN "metrics_exporter.h" EXCLUDE
PATTERN "log_Exporter.h" EXCLUDE)
Expand Down Expand Up @@ -52,7 +52,7 @@ if(WITH_METRICS_PREVIEW)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(
DIRECTORY include/opentelemetry/exporters/ostream
DESTINATION include/opentelemetry/exporters/
DESTINATION include/opentelemetry/exporters
PATTERN "metrics_exporter.h")
if(BUILD_TESTING)
add_executable(ostream_metrics_test test/ostream_metrics_test.cc)
Expand Down Expand Up @@ -82,7 +82,7 @@ if(WITH_LOGS_PREVIEW)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(
DIRECTORY include/opentelemetry/exporters/ostream
DESTINATION include/opentelemetry/exporters/
DESTINATION include/opentelemetry/exporters
PATTERN "log_exporter.h")
if(BUILD_TESTING)
add_executable(ostream_log_test test/ostream_log_test.cc)
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ install(

install(
DIRECTORY include/opentelemetry/exporters/otlp
DESTINATION include/opentelemetry/exporters/
DESTINATION include/opentelemetry/exporters
FILES_MATCHING
PATTERN "*.h"
PATTERN "otlp_recordable.h" EXCLUDE)
Expand Down
2 changes: 1 addition & 1 deletion exporters/prometheus/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ install(

install(
DIRECTORY include/opentelemetry/exporters/prometheus
DESTINATION include/opentelemetry/exporters/
DESTINATION include/opentelemetry/exporters
FILES_MATCHING
PATTERN "*.h")

Expand Down
2 changes: 1 addition & 1 deletion exporters/zipkin/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ install(

install(
DIRECTORY include/opentelemetry/exporters/zipkin
DESTINATION include/opentelemetry/exporters/
DESTINATION include/opentelemetry/exporters
FILES_MATCHING
PATTERN "*.h"
PATTERN "recordable.h" EXCLUDE)
Expand Down
14 changes: 4 additions & 10 deletions sdk/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ install(
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

install(
DIRECTORY include/opentelemetry/
DESTINATION include/opentelemetry/
DIRECTORY include/opentelemetry
DESTINATION include/opentelemetry
FILES_MATCHING
PATTERN "*config.h")

Expand All @@ -31,16 +31,10 @@ endif()

install(
DIRECTORY include/opentelemetry/sdk
DESTINATION include/opentelemetry/
FILES_MATCHING
PATTERN "*.h"
PATTERN "${METRICS_EXCLUDE_PATTERN}" EXCLUDE)

install(
DIRECTORY include/opentelemetry/sdk
DESTINATION include/opentelemetry/
DESTINATION include/opentelemetry
FILES_MATCHING
PATTERN "*.h"
PATTERN "${METRICS_EXCLUDE_PATTERN}" EXCLUDE
PATTERN "${LOGS_EXCLUDE_PATTERN}" EXCLUDE)

add_subdirectory(src)
Expand Down

1 comment on commit 2e9b7a1

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'OpenTelemetry-cpp api Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 2e9b7a1 Previous: defdfd2 Ratio
BM_ProcYieldSpinLockThrashing/2/process_time/real_time 0.7506604564145922 ms/iter 0.3066748644398377 ms/iter 2.45
BM_NaiveSpinLockThrashing/1/process_time/real_time 0.3770752739233981 ms/iter 0.14456414866085424 ms/iter 2.61

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.