Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant tail / in DESTINATION in CMake install #1329

Merged
merged 1 commit into from
Apr 16, 2022
Merged

Remove redundant tail / in DESTINATION in CMake install #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exporters/elasticsearch/CMakeLists.txt
View file
Open in desktop
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
Copy link
Member

@lalitb lalitb Apr 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks for the fix, just curious if this fails build in any scenario?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This don't fail anything so far. I just observed there are path like include/opentelemetry/exporters//etw/config.h which may confuse.

FILES_MATCHING
PATTERN "*.h"
PATTERN "es_log_recordable.h" EXCLUDE)
Expand Down
2 changes: 1 addition & 1 deletion exporters/etw/CMakeLists.txt
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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