From 588f515a5c5f75ea3fe0cf8776fca57cf931feaa Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 3 Jun 2019 15:02:51 +0800 Subject: [PATCH] cmake: link libkv against common_prioritycache_obj as both `kv/rocksdb_cache/BinnedLRUCache.cc` and `kv/rocksdb_cache/ShardedCache.cc` uses `PriorityCache` which is in turn offered by common_prioritycache_obj, we need to link libkv against the latter. libos uses `PriorityCache` as well, but since libos links against libkv, so it's safe. Signed-off-by: Kefu Chai --- src/kv/CMakeLists.txt | 4 +++- src/os/CMakeLists.txt | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/kv/CMakeLists.txt b/src/kv/CMakeLists.txt index 357b7b0e93f..c75bf332a29 100644 --- a/src/kv/CMakeLists.txt +++ b/src/kv/CMakeLists.txt @@ -9,5 +9,7 @@ if (WITH_LEVELDB) list(APPEND kv_srcs LevelDBStore.cc) endif (WITH_LEVELDB) -add_library(kv STATIC ${kv_srcs}) +add_library(kv STATIC ${kv_srcs} + $) + target_link_libraries(kv ${LEVELDB_LIBRARIES} RocksDB::RocksDB) diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt index 53a3da247d3..e65d7393f7a 100644 --- a/src/os/CMakeLists.txt +++ b/src/os/CMakeLists.txt @@ -71,8 +71,7 @@ if(WITH_SPDK) bluestore/NVMEDevice.cc) endif() -add_library(os STATIC ${libos_srcs} - $) +add_library(os STATIC ${libos_srcs}) target_link_libraries(os heap_profiler kv) -- 2.39.5