Skip to content

Commit

Permalink
build: Fix shared library build.
Browse files Browse the repository at this point in the history
* driver/CMakeLists.txt (DRIVER_SOURCES): Add missing headers.
* test/libscap/CMakeLists.txt (LIBSCAP_TESTS_LIBRARIES): Add
${PROTOBUF_LIB}.
* userspace/libsinsp/test/CMakeLists.txt (unit-test-libsinsp): Link to
libgrpc++ to avoid a missing DSO error.

Fixes: #1820
Signed-off-by: Maxim Cournoyer <[email protected]>
  • Loading branch information
Apteryks committed Jan 22, 2025
1 parent b43952c commit c96e0f7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
5 changes: 5 additions & 0 deletions driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,11 @@ set(DRIVER_SOURCES
ppm_consumer.h
capture_macro.h
socketcall_to_syscall.h
syscall_compat_loongarch64.h
syscall_compat_ppc64le.h
syscall_compat_riscv64.h
syscall_compat_s390x.h
syscall_compat_x86_64.h
syscall_ia32_64_map.c
)

Expand Down
8 changes: 7 additions & 1 deletion test/libscap/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@ set(LIBSCAP_TESTS_INCLUDE
# Needed by gtest
find_package(Threads)

set(LIBSCAP_TESTS_LIBRARIES "${GTEST_LIB}" "${GTEST_MAIN_LIB}" "${CMAKE_THREAD_LIBS_INIT}" scap)
set(LIBSCAP_TESTS_LIBRARIES
"${GTEST_LIB}"
"${GTEST_MAIN_LIB}"
"${CMAKE_THREAD_LIBS_INIT}"
"${PROTOBUF_LIB}"
scap
)

set(LIBSCAP_TESTS_DEPENDENCIES gtest scap)

Expand Down
3 changes: 2 additions & 1 deletion userspace/libsinsp/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ target_include_directories(
)

target_link_libraries(
unit-test-libsinsp sinsp "${GTEST_LIB}" "${GTEST_MAIN_LIB}" "${TBB_LIB}" "${JSONCPP_LIB}"
unit-test-libsinsp sinsp "${GRPCPP_LIB}" "${GTEST_LIB}" "${GTEST_MAIN_LIB}"
"${TBB_LIB}" "${JSONCPP_LIB}"
)

# Add some additional include directories associated with `ADDITIONAL_SINSP_TESTS_SUITE`
Expand Down

0 comments on commit c96e0f7

Please sign in to comment.