Merge pull request #19963 from runsisi/wip-cmake

cmake: do not find bzip2/lz4 for rocksdb Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Jan 22, 2018 · d3785b4 · d3785b4
2 parents 8cbee47 + 08a4de1
commit d3785b4
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/kv/CMakeLists.txt b/src/kv/CMakeLists.txt
@@ -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)