]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: do not find bzip2/lz4 for rocksdb 19963/head
authorrunsisi <runsisi@zte.com.cn>
Tue, 16 Jan 2018 06:42:06 +0000 (14:42 +0800)
committerrunsisi <runsisi@zte.com.cn>
Tue, 16 Jan 2018 11:44:44 +0000 (19:44 +0800)
RocksDB has compression disabled by default[1] and it's never been enabled[2],
so do not link these compression libraries implicitly

[1] https://github.com/ceph/rocksdb/blob/master/CMakeLists.txt#L76
[2] https://github.com/ceph/ceph/blob/master/cmake/modules/BuildRocksDB.cmake

Signed-off-by: runsisi <runsisi@zte.com.cn>
src/kv/CMakeLists.txt

index d9904b05ee2d9ea0d3f135fd2af7f32b35b1e6f0..724cd2d6f080134df47d1e9852764645b72426ab 100644 (file)
@@ -12,13 +12,3 @@ add_library(kv STATIC $<TARGET_OBJECTS:kv_objs>)
 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})
-
-# rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same.
-find_package(BZip2 QUIET)
-if (BZIP2_FOUND)
-  target_link_libraries(kv ${BZIP2_LIBRARIES})
-endif (BZIP2_FOUND)
-find_package(LZ4 QUIET)
-if (LZ4_FOUND)
-  target_link_libraries(kv ${LZ4_LIBRARY})
-endif (LZ4_FOUND)