X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2FCMakeLists.txt;h=79829401c93927237f8b5dfc951db48fabcd50a4;hb=9235d43d231b103285be539ebe64d37620fe9930;hp=4b1719d14735caa39c9cb84fd1ec988360c9272f;hpb=ef80ad6bff03e3cc35950de0e15e4821ef3f7c04;p=vpp.git diff --git a/src/plugins/dpdk/CMakeLists.txt b/src/plugins/dpdk/CMakeLists.txt index 4b1719d1473..79829401c93 100644 --- a/src/plugins/dpdk/CMakeLists.txt +++ b/src/plugins/dpdk/CMakeLists.txt @@ -31,11 +31,11 @@ endif() ############################################################################## # Parse DPDK config and version header files ############################################################################## - file(STRINGS ${DPDK_INCLUDE_DIR}/rte_config.h rte_config) file(STRINGS ${DPDK_INCLUDE_DIR}/rte_version.h rte_version) +file(STRINGS ${DPDK_INCLUDE_DIR}/rte_build_config.h rte_build_config) -foreach(l ${rte_config} ${rte_version}) +foreach(l ${rte_config} ${rte_build_config} ${rte_version}}) if (l MATCHES "^#define[\t ]*RTE_") STRING(REGEX REPLACE "^#define[\t ]*([A-Z1-9_]+)[\t ]*(.+)" "\\1;\\2" v "${l}") list(GET v 0 name) @@ -82,21 +82,6 @@ endif() vpp_plugin_find_library(dpdk NUMA_LIB "numa") list(APPEND DPDK_LINK_LIBRARIES ${NUMA_LIB}) -############################################################################## -# AESNI libraries -############################################################################## -if(DPDK_RTE_LIBRTE_PMD_AESNI_MB OR DPDK_RTE_LIBRTE_PMD_AESNI_GCM) - if(DPDK_IS_SHARED_LIB) - vpp_plugin_find_library(dpdk IPSECMB_LIB "libIPSec_MB.so") - list(APPEND DPDK_LINK_LIBRARIES "${IPSECMB_LIB}") - else() - vpp_plugin_find_library(dpdk IPSECMB_LIB "libIPSec_MB.a") - get_filename_component(IPSECMB_LIB_DIR ${IPSECMB_LIB} DIRECTORY) - string_append(DPDK_LINK_FLAGS "-L${IPSECMB_LIB_DIR}") - string_append(DPDK_LINK_FLAGS "-Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a") - endif() -endif() - ############################################################################## # Mellanox libraries ##############################################################################