From 0bc87844a84043b4289534ca8d25cd82352ec333 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 23 May 2018 23:20:21 +0800 Subject: [PATCH] cmake/modules/BuildRocksDB.cmake: enable compressions for rocksdb we should enable them if they are found. currently, we don't have bzip2 compressor plugin, so it's not detected in the cmake script. we can always enable it for rocksdb in future. Fixes: http://tracker.ceph.com/issues/24025 Signed-off-by: Kefu Chai (cherry picked from commit 71462ddf05afa59bdaed8c471ee0617ee08dc71a) --- cmake/modules/BuildRocksDB.cmake | 3 +++ src/kv/CMakeLists.txt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake index 2a627e8a1c23..71a1e2a1a2c6 100644 --- a/cmake/modules/BuildRocksDB.cmake +++ b/cmake/modules/BuildRocksDB.cmake @@ -13,6 +13,9 @@ function(do_build_rocksdb) list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}) endif() + list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_SNAPPY=${SNAPPY_FOUND}) + list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_LZ4=${LZ4_FOUND}) + list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_ZLIB=${ZLIB_FOUND}) list(APPEND ROCKSDB_CMAKE_ARGS -DPORTABLE=ON) list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_AR=${CMAKE_AR}) list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) diff --git a/src/kv/CMakeLists.txt b/src/kv/CMakeLists.txt index 724cd2d6f080..c20bb5e40999 100644 --- a/src/kv/CMakeLists.txt +++ b/src/kv/CMakeLists.txt @@ -12,3 +12,6 @@ add_library(kv STATIC $) target_include_directories(kv_objs SYSTEM BEFORE PUBLIC ${ROCKSDB_INCLUDE_DIR}) target_include_directories(kv SYSTEM BEFORE PUBLIC ${ROCKSDB_INCLUDE_DIR}) target_link_libraries(kv ${LEVELDB_LIBRARIES} ${ROCKSDB_LIBRARIES} ${ALLOC_LIBS} ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES}) +if(WITH_LZ4) + target_link_libraries(kv ${LZ4_LIBRARY}) +endif() -- 2.47.3