From: Kefu Chai <kchai@redhat.com>
Date: Mon, 3 Jun 2019 07:02:51 +0000 (+0800)
Subject: cmake: link libkv against common_prioritycache_obj
X-Git-Tag: v15.1.0~2568^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=588f515a5c5f75ea3fe0cf8776fca57cf931feaa;p=ceph.git

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 <kchai@redhat.com>
---

diff --git a/src/kv/CMakeLists.txt b/src/kv/CMakeLists.txt
index 357b7b0e93ff..c75bf332a298 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_OBJECTS:common_prioritycache_obj>)
+
 target_link_libraries(kv ${LEVELDB_LIBRARIES} RocksDB::RocksDB)
diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index 53a3da247d36..e65d7393f7ae 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}
-  $<TARGET_OBJECTS:common_prioritycache_obj>)
+add_library(os STATIC ${libos_srcs})
 
 target_link_libraries(os heap_profiler kv)