From 8b1c06dce9cab17d8d522cd94fc793da7ece71c7 Mon Sep 17 00:00:00 2001 From: Roman Penyaev Date: Wed, 19 Aug 2020 20:26:32 +0200 Subject: [PATCH] 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 --- cmake/modules/BuildDPDK.cmake | 5 ++--- cmake/modules/BuildSPDK.cmake | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/modules/BuildDPDK.cmake b/cmake/modules/BuildDPDK.cmake index e9d16d0709b4..b33bda0a9b6f 100644 --- 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 2d78fc917bf2..60575a7abaf9 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 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 -- 2.47.3