diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-07-10 14:13:21 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-07-10 14:13:21 +0100 |
| commit | 418c10101093408aa370f0febf08d36032f1eb4b (patch) | |
| tree | 317e2eff739a88822fbcace159cc3c2b1ce17503 /src | |
| parent | d7b92e1c6518603e82134807ab4c9500aafc43fa (diff) | |
| download | rspamd-418c10101093408aa370f0febf08d36032f1eb4b.tar.gz rspamd-418c10101093408aa370f0febf08d36032f1eb4b.zip | |
[Minor] Redis support is now unconditional
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/libserver/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/libstat/CMakeLists.txt | 10 |
3 files changed, 7 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f01f7a45c..0f9cbd668 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -171,9 +171,7 @@ TARGET_LINK_LIBRARIES(rspamd rspamd-server) IF (ENABLE_SNOWBALL MATCHES "ON") TARGET_LINK_LIBRARIES(rspamd stemmer) ENDIF() -IF(ENABLE_HIREDIS MATCHES "ON") - TARGET_LINK_LIBRARIES(rspamd rspamd-hiredis) -ENDIF() +TARGET_LINK_LIBRARIES(rspamd rspamd-hiredis) IF (ENABLE_FANN MATCHES "ON") TARGET_LINK_LIBRARIES(rspamd fann) diff --git a/src/libserver/CMakeLists.txt b/src/libserver/CMakeLists.txt index 03d11acb6..ac2c123dc 100644 --- a/src/libserver/CMakeLists.txt +++ b/src/libserver/CMakeLists.txt @@ -21,10 +21,8 @@ SET(LIBRSPAMDSERVERSRC ${CMAKE_CURRENT_SOURCE_DIR}/url.c ${CMAKE_CURRENT_SOURCE_DIR}/worker_util.c) -IF (ENABLE_HIREDIS MATCHES "ON") - LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend_redis.c") - LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/redis_pool.c") -ENDIF () +LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend_redis.c") +LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/redis_pool.c") # Librspamd-server SET(RSPAMD_SERVER ${LIBRSPAMDSERVERSRC} PARENT_SCOPE) diff --git a/src/libstat/CMakeLists.txt b/src/libstat/CMakeLists.txt index 0bc920616..1019a9925 100644 --- a/src/libstat/CMakeLists.txt +++ b/src/libstat/CMakeLists.txt @@ -12,12 +12,10 @@ SET(BACKENDSSRC ${CMAKE_CURRENT_SOURCE_DIR}/backends/mmaped_file.c ${CMAKE_CURRENT_SOURCE_DIR}/backends/sqlite3_backend.c) SET(CACHESSRC ${CMAKE_CURRENT_SOURCE_DIR}/learn_cache/sqlite3_cache.c) -IF(ENABLE_HIREDIS MATCHES "ON") - SET(BACKENDSSRC ${BACKENDSSRC} - ${CMAKE_CURRENT_SOURCE_DIR}/backends/redis_backend.c) - SET(CACHESSRC ${CACHESSRC} - ${CMAKE_CURRENT_SOURCE_DIR}/learn_cache/redis_cache.c) -ENDIF(ENABLE_HIREDIS MATCHES "ON") +SET(BACKENDSSRC ${BACKENDSSRC} + ${CMAKE_CURRENT_SOURCE_DIR}/backends/redis_backend.c) +SET(CACHESSRC ${CACHESSRC} + ${CMAKE_CURRENT_SOURCE_DIR}/learn_cache/redis_cache.c) SET(RSPAMD_STAT ${LIBSTATSRC} |