From: Kefu Chai <kchai@redhat.com>
Date: Wed, 15 Nov 2017 13:15:08 +0000 (+0800)
Subject: cmake: remove duplicated spdk linkage
X-Git-Tag: v13.0.1~180^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79db2c40959d9856c3dbde22b16be264707993dc;p=ceph.git

cmake: remove duplicated spdk linkage

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

diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index 16ac95d0cd73..050b02de894f 100644
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -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