diff options
| author |   Fan Zhang <roy.fan.zhang@intel.com> | 2020-09-25 22:36:04 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2020-09-29 09:00:40 +0000 |
| commit | 1152e60ebe9a4e9c7fa1c3df780fa999226fb31f (patch) | |
| tree | 2bd66e0d38647e5a1f918251e98bda6940794078 /src/plugins/dpdk/CMakeLists.txt | |
| parent | 8b388e35b2aeca39c277453337751d14aeba0d40 (diff) | |
dpdk: fix compile
Type: fix
Since DPDK is now compiled by meson but some compiles in VPP is
missing. This patch fixes that.
- Fixes QAT PMD not compiled. QAT meson compile, even for sym
crypto PMD, is happened in drive/compress/qat. Originally all
PMDs in compressdev is disabled by default. This patch fixes
that.
- Fixes DPDK plugin version detection. DPDK meson build
generates rte_build_config.h, which containing all version
information in build-dpdk instead of rte_config.h in make.
This patch uses the file to detect version data.
- Removed SW crypto PMD auto-creation in cryptodev engine. In
case the AESNI-MB PMD required shared library is missing.
Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
Change-Id: I7cd91abb5de303ff5e4c55cd05e011b57f883524
Diffstat (limited to 'src/plugins/dpdk/CMakeLists.txt')
| -rw-r--r-- | src/plugins/dpdk/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/dpdk/CMakeLists.txt b/src/plugins/dpdk/CMakeLists.txt index 4b1719d1473..0236172792d 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) |