Skip to content

Propagate SOD linkage through lightnvr_lib #927

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
matteius merged 3 commits into from
Nov 7, 2026
Merged

Propagate SOD linkage through lightnvr_lib #927

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
497fe84
Apply suggested fix to CMakeLists.txt from Copilot Autofix
matteius Nov 7, 2026
ccbfa7e
Merge remote-tracking branch 'origin/main' into fix/ai-findings-927
matteius Nov 7, 2026
e54734a
Use transitive SOD linkage for executables and unit tests
matteius Nov 7, 2026
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
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,8 +910,9 @@ endif()

# Link SOD library if enabled
if(ENABLE_SOD)
# Always link to the sod target, whether it's built as static or shared
target_link_libraries(lightnvr sod)
# SOD symbols are used by objects in this static library. Publish the
# dependency so the main executable, tests and utilities all inherit it.
target_link_libraries(lightnvr_lib PUBLIC sod)

# Log the linking method for clarity
if(SOD_DYNAMIC_LINK)
Expand Down
6 changes: 0 additions & 6 deletions tests/unit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ macro(add_layer2_test TEST_NAME)
if(ENABLE_MQTT AND MOSQUITTO_FOUND)
target_link_libraries(${TEST_NAME} ${MOSQUITTO_LIBRARIES})
endif()
if(ENABLE_SOD)
target_link_libraries(${TEST_NAME} sod)
endif()
set_target_properties(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
if("${TEST_NAME}" STREQUAL "test_storage_archive")
find_package(Python3 COMPONENTS Interpreter REQUIRED)
Expand Down Expand Up @@ -112,9 +109,6 @@ macro(add_layer3_test TEST_NAME)
if(ENABLE_MQTT AND MOSQUITTO_FOUND)
target_link_libraries(${TEST_NAME} ${MOSQUITTO_LIBRARIES})
endif()
if(ENABLE_SOD)
target_link_libraries(${TEST_NAME} sod)
endif()
set_target_properties(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME})
lightnvr_ci_test(${TEST_NAME} ${ARGN})
Expand Down
Loading