[Feature] add SYSTEM_ZSTD cmake option

To use the system zstd instead on the bundled version

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9706637e0b382223387082ca7f5f267d2dc6f7a4..a0800ee0d33faa800762b0284216c835e431a6a6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,7 @@ OPTION(ENABLE_UTILS        "Build rspamd internal utils [default: OFF]" OFF)
 OPTION(ENABLE_LIBUNWIND    "Use libunwind to print crash traces [default: OFF]" OFF)
 OPTION(ENABLE_LUA_TRACE    "Trace all Lua C API invocations [default: OFF]" OFF)
 OPTION(ENABLE_LUA_REPL     "Enables Lua repl (requires C++11 compiler) [default: ON]" ON)
+OPTION(SYSTEM_ZSTD         "Use system zstd instead of bundled one [default: OFF]" OFF)
 
 ############################# INCLUDE SECTION #############################################
 
@@ -625,7 +626,12 @@ ADD_SUBDIRECTORY(contrib/http-parser)
 ADD_SUBDIRECTORY(contrib/fpconv)
 ADD_SUBDIRECTORY(contrib/lc-btrie)
 ADD_SUBDIRECTORY(contrib/libottery)
-ADD_SUBDIRECTORY(contrib/zstd)
+IF(SYSTEM_ZSTD MATCHES "OFF")
+       ADD_SUBDIRECTORY(contrib/zstd)
+ELSE()
+       ProcessPackage(LIBZSTD LIBRARY zstd INCLUDE zstd.h
+               ROOT ${LIBZSTD_ROOT_DIR} MODULES zstd)
+ENDIF()
 IF(ENABLE_SNOWBALL MATCHES "ON")
        ADD_SUBDIRECTORY(contrib/snowball)
        SET(WITH_SNOWBALL 1)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04eae40573068df3dd4d25b044597ff971e3587d..903aa3159c2793c2777bf6f79d56c50bd86f9baf 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -194,7 +194,11 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fpconv)
 TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
 TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
 TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
-TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+IF(SYSTEM_ZSTD MATCHES "OFF")
+       TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+ELSE()
+       TARGET_LINK_LIBRARIES(rspamd-server zstd)
+ENDIF()
 TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
 TARGET_LINK_LIBRARIES(rspamd-server fmt)