From 3f104c8095635ba87e6a11c76588cafde4f37d17 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Fri, 15 Apr 2022 16:25:30 -0700 Subject: [PATCH] Remove redundant tail / in CMake install --- exporters/elasticsearch/CMakeLists.txt | 2 +- exporters/etw/CMakeLists.txt | 2 +- exporters/jaeger/CMakeLists.txt | 2 +- exporters/memory/CMakeLists.txt | 2 +- exporters/ostream/CMakeLists.txt | 6 +++--- exporters/otlp/CMakeLists.txt | 2 +- exporters/prometheus/CMakeLists.txt | 2 +- exporters/zipkin/CMakeLists.txt | 2 +- sdk/CMakeLists.txt | 14 ++++---------- 9 files changed, 14 insertions(+), 20 deletions(-) diff --git a/exporters/elasticsearch/CMakeLists.txt b/exporters/elasticsearch/CMakeLists.txt index 9b2833854e..b21dae400a 100644 --- a/exporters/elasticsearch/CMakeLists.txt +++ b/exporters/elasticsearch/CMakeLists.txt @@ -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) diff --git a/exporters/etw/CMakeLists.txt b/exporters/etw/CMakeLists.txt index 0489b41af6..47791b4abf 100644 --- a/exporters/etw/CMakeLists.txt +++ b/exporters/etw/CMakeLists.txt @@ -23,7 +23,7 @@ install( install( DIRECTORY include/opentelemetry/exporters/etw - DESTINATION include/opentelemetry/exporters/ + DESTINATION include/opentelemetry/exporters FILES_MATCHING PATTERN "*.h") diff --git a/exporters/jaeger/CMakeLists.txt b/exporters/jaeger/CMakeLists.txt index 6d3d8b88fb..a95c0cc941 100644 --- a/exporters/jaeger/CMakeLists.txt +++ b/exporters/jaeger/CMakeLists.txt @@ -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) diff --git a/exporters/memory/CMakeLists.txt b/exporters/memory/CMakeLists.txt index a4b8d837fd..d489ec1606 100644 --- a/exporters/memory/CMakeLists.txt +++ b/exporters/memory/CMakeLists.txt @@ -17,7 +17,7 @@ install( install( DIRECTORY include/opentelemetry/exporters/memory - DESTINATION include/opentelemetry/exporters/ + DESTINATION include/opentelemetry/exporters FILES_MATCHING PATTERN "*.h") diff --git a/exporters/ostream/CMakeLists.txt b/exporters/ostream/CMakeLists.txt index e83719cce3..31f1e9b0d0 100644 --- a/exporters/ostream/CMakeLists.txt +++ b/exporters/ostream/CMakeLists.txt @@ -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) @@ -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) @@ -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) diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt index 1dba7ea1c7..1b1b200504 100755 --- a/exporters/otlp/CMakeLists.txt +++ b/exporters/otlp/CMakeLists.txt @@ -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) diff --git a/exporters/prometheus/CMakeLists.txt b/exporters/prometheus/CMakeLists.txt index 9b2c92ef73..753fa18cac 100755 --- a/exporters/prometheus/CMakeLists.txt +++ b/exporters/prometheus/CMakeLists.txt @@ -46,7 +46,7 @@ install( install( DIRECTORY include/opentelemetry/exporters/prometheus - DESTINATION include/opentelemetry/exporters/ + DESTINATION include/opentelemetry/exporters FILES_MATCHING PATTERN "*.h") diff --git a/exporters/zipkin/CMakeLists.txt b/exporters/zipkin/CMakeLists.txt index b82339f1ee..559e8d5001 100644 --- a/exporters/zipkin/CMakeLists.txt +++ b/exporters/zipkin/CMakeLists.txt @@ -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) diff --git a/sdk/CMakeLists.txt b/sdk/CMakeLists.txt index 6421e3ad15..1a824fe09b 100644 --- a/sdk/CMakeLists.txt +++ b/sdk/CMakeLists.txt @@ -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") @@ -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)