cmake: update list of libraries compiled from DPDK/SPDK

on the newest DPDK/SPDK some libraries were removed, while some of them
were added. so update the list accordingly to address linking errors.

Signed-off-by: Roman Penyaev <rpenyaev@suse.de>

diff --git a/cmake/modules/BuildDPDK.cmake b/cmake/modules/BuildDPDK.cmake
index e9d16d0709b488889533ccede44d5b631a89ef10..b33bda0a9b6fe7076566a5983cfa70e90f2b2ecd 100644 (file)
--- a/cmake/modules/BuildDPDK.cmake
+++ b/cmake/modules/BuildDPDK.cmake
@@ -118,15 +118,14 @@ function(do_export_dpdk dpdk_dir)
 
   list(APPEND dpdk_components
     bus_pci
-    cmdline
     eal
-    ethdev
     kvargs
     mbuf
     mempool
     mempool_ring
     pci
-    ring)
+    ring
+    telemetry)
   if(Seastar_DPDK)
     list(APPEND dpdk_components
       bus_vdev

diff --git a/cmake/modules/BuildSPDK.cmake b/cmake/modules/BuildSPDK.cmake
index 2d78fc917bf2b04799a025eb99ad8d6ec9d7bc2c..60575a7abaf9088103ddb04b20a987cf6b07db91 100644 (file)
--- 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 sock util)
+  foreach(c lvol env_dpdk sock nvmf bdev nvme conf thread trace notify accel event_accel blob vmd event_vmd event_bdev sock_posix event_sock event rpc jsonrpc json util log)
     add_library(spdk::${c} STATIC IMPORTED)
     add_dependencies(spdk::${c} spdk-ext)
     set_target_properties(spdk::${c} PROPERTIES