Skip to content

elos release 1.40.4 #41

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

Merged
abutscher merged 3 commits into from
Sep 30, 2025
Merged

elos release 1.40.4 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a62666
ci(fix): don't build the dlt scanner when not building libelosdlt
friedz Sep 29, 2025
9077552
elos: Update to 1.40.4
abutscher Sep 30, 2025
a98f613
Merge branch 'bug/#29493-fix-build-without-libelosdlt' into 'integrat…
abutscher Sep 30, 2025
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 cmake/project.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: MIT
set(ELOS_VERSION 1.40.3)
set(ELOS_VERSION 1.40.4)

# Attention: Aside from the version, as many things as possible in this file
# should be put into functions, as this solves potential issues with commands
Expand Down
26 changes: 14 additions & 12 deletions src/demos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,20 +131,22 @@ if (ELOS_DEMOS)
install(TARGETS demo_eloslog DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()

add_executable(
mng_dlt_buffer
mng_dlt_buffer.c
)
if (ELOSD_LIBDLT)
add_executable(
mng_dlt_buffer
mng_dlt_buffer.c
)

target_link_libraries(
mng_dlt_buffer
PRIVATE
scanner_dlt_hv_interface
)
target_link_libraries(
mng_dlt_buffer
PRIVATE
scanner_dlt_hv_interface
)

if (INSTALL_ELOS_DEMOS)
install(TARGETS mng_dlt_buffer DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if (INSTALL_ELOS_DEMOS)
install(TARGETS mng_dlt_buffer DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
endif (ELOSD_LIBDLT)

add_executable(
demo_eventbuffer
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/scanners/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ add_subdirectory(kmsg)
add_subdirectory(shmem)
add_subdirectory(syslog)
add_subdirectory(oomkiller)
add_subdirectory(dlt_hv)
if (ELOSD_LIBDLT)
add_subdirectory(dlt_hv)
endif (ELOSD_LIBDLT)
4 changes: 3 additions & 1 deletion test/utest/plugins/scanner/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@

add_subdirectory(syslog)
add_subdirectory(kmsg)
add_subdirectory(dlt_hv)
if (ELOSD_LIBDLT)
add_subdirectory(dlt_hv)
endif (ELOSD_LIBDLT)