Skip to content

build: Link system libzstd when enabling in_systemd plugin #11088

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

Closed
wants to merge 1 commit into from
Closed

build: Link system libzstd when enabling in_systemd plugin #11088

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
28 changes: 16 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,18 +577,6 @@ add_subdirectory(${FLB_PATH_LIB_MPACK} EXCLUDE_FROM_ALL)
# Miniz (zip)
add_subdirectory(${FLB_PATH_LIB_MINIZ} EXCLUDE_FROM_ALL)

# Zstd (zstd)
if(FLB_PREFER_SYSTEM_LIB_ZSTD)
find_package(PkgConfig)
pkg_check_modules(LIBZSTD libzstd>=1.4.8)
endif()
if(LIBZSTD_FOUND)
include_directories(${LIBZSTD_INCLUDE_DIRS})
link_directories(${LIBZSTD_LIBRARY_DIRS})
else()
include(cmake/zstd.cmake)
endif()

# ring buffer library
add_subdirectory(${FLB_PATH_LIB_RING_BUFFER} EXCLUDE_FROM_ALL)

Expand Down Expand Up @@ -886,6 +874,22 @@ else()
FLB_OPTION(FLB_IN_SYSTEMD OFF)
endif()

# Zstd (zstd)
if(FLB_PREFER_SYSTEM_LIB_ZSTD OR (FLB_SYSTEM_LINUX AND FLB_IN_SYSTEMD))
find_package(PkgConfig)
pkg_check_modules(LIBZSTD libzstd>=1.4.8 QUIET)
if (NOT LIBZSTD_FOUND)
pkg_check_modules(LIBZSTD zstd>=1.4.8 QUIET)
endif()
endif()
if(LIBZSTD_FOUND)
message(STATUS "Using system libzstd: ${LIBZSTD_VERSION}")
include_directories(${LIBZSTD_INCLUDE_DIRS})
link_directories(${LIBZSTD_LIBRARY_DIRS})
else()
include(cmake/zstd.cmake)
endif()

# Valgrind support
check_c_source_compiles("
#include <valgrind/valgrind.h>
Expand Down
Loading