]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake/modules/BuildRocksDB.cmake: enable compressions for rocksdb 22215/head
authorKefu Chai <kchai@redhat.com>
Wed, 23 May 2018 15:20:21 +0000 (23:20 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 24 May 2018 12:05:40 +0000 (20:05 +0800)
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 <kchai@redhat.com>
(cherry picked from commit d0b7b52a42bcc70d853f5b5ede66d8d123637e3f)

Conflicts:
cmake/modules/BuildRocksDB.cmake:
CMakeLists.txt: in luminous, BuildRocksDB.cmake is not extracted
yet, so update CMakeLists.txt instead.

src/CMakeLists.txt

index d647783423e175e9d098e72d4f9fd2e29ae836de..1a71368d8050e76f50188381cb31a6e0a3c7a262 100644 (file)
@@ -821,6 +821,10 @@ if (NOT WITH_SYSTEM_ROCKSDB)
     list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
   endif(WITH_CCACHE AND CCACHE_FOUND)
 
+  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})
+
   # SSE 4.2 is enabled by default in rocksdb's crc32c. For details refer to
   # rocksdb/util/crc32c.cc.
   list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_AR=${CMAKE_AR})