From: Kefu Chai <kchai@redhat.com>
Date: Wed, 12 Jun 2019 11:18:53 +0000 (+0800)
Subject: cmake: update built libs of SPDK and DPDK
X-Git-Tag: v15.1.0~2467^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=423c28fb8db34754fb9b4c70035ad98dd9c9042a;p=ceph.git

cmake: update built libs of SPDK and DPDK

we need to link against these new libs for fulfilling the dependencies
required by new SPDK.

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

diff --git a/cmake/modules/BuildDPDK.cmake b/cmake/modules/BuildDPDK.cmake
index cda191d8cf24..a14af918fd6e 100644
--- a/cmake/modules/BuildDPDK.cmake
+++ b/cmake/modules/BuildDPDK.cmake
@@ -111,6 +111,7 @@ function(build_dpdk dpdk_dir)
 
   foreach(c
       bus_pci
+      cmdline
       eal
       ethdev
       kvargs
diff --git a/cmake/modules/BuildSPDK.cmake b/cmake/modules/BuildSPDK.cmake
index 5e0e2bfc76c6..4b8306a38818 100644
--- a/cmake/modules/BuildSPDK.cmake
+++ b/cmake/modules/BuildSPDK.cmake
@@ -31,7 +31,7 @@ macro(build_spdk)
     INSTALL_COMMAND "true")
   unset(make_cmd)
   ExternalProject_Get_Property(spdk-ext source_dir)
-  foreach(c nvme log lvol env_dpdk util)
+  foreach(c nvme log lvol env_dpdk sock util)
     add_library(spdk::${c} STATIC IMPORTED)
     add_dependencies(spdk::${c} spdk-ext)
     set_target_properties(spdk::${c} PROPERTIES