cmake: remove kv_objs target

libkv is better than kv_objs, as it is able to bring more
properties with with it, for instance, the public include
directories, the public/private libraries it is linked against.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/kv/CMakeLists.txt b/src/kv/CMakeLists.txt
index 51f25b94e32399e78c04db7f6883bcfb2d6976cd..357b7b0e93ffde69d943275df4befc95068e88ab 100644 (file)
--- a/src/kv/CMakeLists.txt
+++ b/src/kv/CMakeLists.txt
@@ -9,10 +9,5 @@ if (WITH_LEVELDB)
   list(APPEND kv_srcs LevelDBStore.cc)
 endif (WITH_LEVELDB)
 
-add_library(kv_objs OBJECT ${kv_srcs})
-add_library(kv STATIC $<TARGET_OBJECTS:kv_objs>)
-target_include_directories(kv_objs SYSTEM BEFORE PUBLIC
-  $<TARGET_PROPERTY:RocksDB::RocksDB,INTERFACE_INCLUDE_DIRECTORIES>)
-target_include_directories(kv SYSTEM BEFORE PUBLIC
-  $<TARGET_PROPERTY:RocksDB::RocksDB,INTERFACE_INCLUDE_DIRECTORIES>)
+add_library(kv STATIC ${kv_srcs})
 target_link_libraries(kv ${LEVELDB_LIBRARIES} RocksDB::RocksDB)

diff --git a/src/mon/CMakeLists.txt b/src/mon/CMakeLists.txt
index 23396f063bd0ab89b108bcea637259f8008669bd..62b41dc2acd9931d3777a8d5a9c489facb3bae40 100644 (file)
--- a/src/mon/CMakeLists.txt
+++ b/src/mon/CMakeLists.txt
@@ -30,6 +30,5 @@ if(HAVE_GSSAPI)
 endif()
 
 add_library(mon STATIC
-  ${lib_mon_srcs}
-  $<TARGET_OBJECTS:kv_objs>)
-target_link_libraries(mon heap_profiler)
+  ${lib_mon_srcs})
+target_link_libraries(mon kv heap_profiler)

diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index 3b1965512dc89383779d6430511190ed8a36bed6..53a3da247d366b839096f54325b50a4afa670e63 100644 (file)
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -72,10 +72,9 @@ if(WITH_SPDK)
 endif()
 
 add_library(os STATIC ${libos_srcs}
-  $<TARGET_OBJECTS:kv_objs>
   $<TARGET_OBJECTS:common_prioritycache_obj>)
 
-target_link_libraries(os heap_profiler)
+target_link_libraries(os heap_profiler kv)
 
 if(WITH_BLUEFS)
   add_library(bluefs SHARED