]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: remove duplicated spdk linkage
authorKefu Chai <kchai@redhat.com>
Wed, 15 Nov 2017 13:15:08 +0000 (21:15 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 18 Nov 2017 02:44:56 +0000 (10:44 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/os/CMakeLists.txt

index 16ac95d0cd7303dd7db111c82aeb985f2f56728d..050b02de894f75a9a9e87b0cc86f9dbb906bda2a 100644 (file)
@@ -90,15 +90,9 @@ if(HAVE_LIBZFS)
 endif()
 
 if(WITH_SPDK)
-  # librt is used by libspdk_env_dpdk
   target_link_libraries(os
-    ${SPDK_LIBRARIES} rt
-    ${DPDK_LIBRARIES})
-  target_include_directories(os
-    SYSTEM
-    PRIVATE
-    ${DPDK_INCLUDE_DIR})
-endif(WITH_SPDK)
+    ${SPDK_LIBRARIES})
+endif()
 
 if(WITH_LTTNG)
   add_dependencies(os objectstore-tp)
@@ -119,14 +113,6 @@ if(WITH_BLUESTORE)
     DESTINATION bin)
 endif()
 
-if(WITH_SPDK)
-  include(BuildSPDK)
-  include_directories(SYSTEM ${SPDK_INCLUDE_DIR})
-  foreach(lib nvme log env_dpdk util)
-    target_link_libraries(os spdk_${lib})
-  endforeach()
-endif(WITH_SPDK)
-
 if(WITH_PMEM)
   include(ExternalProject)
   ExternalProject_Add(nvml_ext