Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/user_events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
uses: actions/checkout@v7.0.1
with:
path: opentelemetry-cpp-contrib
submodules: "recursive"
- name: checkout opentelemetry-cpp
uses: actions/checkout@v7.0.1
with:
Expand Down
18 changes: 13 additions & 5 deletions exporters/user_events/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,28 @@ if(MAIN_PROJECT)
find_package(opentelemetry-cpp REQUIRED)
endif()

if(BUILD_TRACEPOINTS)
if(NOT BUILD_TRACEPOINTS)
find_package(eventheader-headers QUIET)
endif()

if(BUILD_TRACEPOINTS OR NOT eventheader_headers_FOUND)
set(ORIGINAL_BUILD_SAMPLES ${BUILD_SAMPLES})
set(ORIGINAL_BUILD_TOOLS ${BUILD_TOOLS})

# don't build samples and tools from LinuxTracepoints.
set(BUILD_SAMPLES OFF)
set(BUILD_TOOLS OFF)
add_subdirectory(third_party/LinuxTracepoints)

FetchContent_Declare(
tracepoints
GIT_REPOSITORY https://github.com/microsoft/LinuxTracepoints.git
GIT_TAG ebc5eaaa21382a48c5883d111626c4dc46684ca2 # v1.4.0
)
FetchContent_MakeAvailable(tracepoints)

# Restore original values
set(BUILD_SAMPLES ${ORIGINAL_BUILD_SAMPLES})
set(BUILD_TOOLS ${ORIGINAL_BUILD_TOOLS})
else()
find_package(eventheader-headers REQUIRED CONFIG)
endif()

include_directories(include)
Expand Down Expand Up @@ -174,4 +182,4 @@ else()
FILES_MATCHING
PATTERN
"*.h")
endif()
endif()
1 change: 0 additions & 1 deletion exporters/user_events/third_party/LinuxTracepoints
Submodule LinuxTracepoints deleted from a817b9