cmake: add rte_mempool_{ring,stack} to Finddpdk.cmake

* also refactor it a little bit

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-01-10 15:14:01 +08:00
parent 9964ac9251
commit e8add075ec

View File

@ -7,53 +7,25 @@
# DPDK_LIBRARIES
find_path(DPDK_INCLUDE_DIR rte_config.h
PATH_SUFFIXES dpdk)
find_library(DPDK_rte_hash_LIBRARY rte_hash)
find_library(DPDK_rte_kvargs_LIBRARY rte_kvargs)
find_library(DPDK_rte_mbuf_LIBRARY rte_mbuf)
find_library(DPDK_rte_ethdev_LIBRARY rte_ethdev)
find_library(DPDK_rte_mempool_LIBRARY rte_mempool)
find_library(DPDK_rte_ring_LIBRARY rte_ring)
find_library(DPDK_rte_eal_LIBRARY rte_eal)
find_library(DPDK_rte_cmdline_LIBRARY rte_cmdline)
find_library(DPDK_rte_pmd_bond_LIBRARY rte_pmd_bond)
find_library(DPDK_rte_pmd_vmxnet3_uio_LIBRARY rte_pmd_vmxnet3_uio)
find_library(DPDK_rte_pmd_ixgbe_LIBRARY rte_pmd_ixgbe)
find_library(DPDK_rte_pmd_i40e_LIBRARY rte_pmd_i40e)
find_library(DPDK_rte_pmd_ring_LIBRARY rte_pmd_ring)
find_library(DPDK_rte_pmd_af_packet_LIBRARY rte_pmd_af_packet)
PATH_SUFFIXES dpdk
HINTS $ENV{DPDK_DIR}/include)
set(check_LIBRARIES
${DPDK_rte_hash_LIBRARY}
${DPDK_rte_kvargs_LIBRARY}
${DPDK_rte_mbuf_LIBRARY}
${DPDK_rte_ethdev_LIBRARY}
${DPDK_rte_mempool_LIBRARY}
${DPDK_rte_ring_LIBRARY}
${DPDK_rte_eal_LIBRARY}
${DPDK_rte_cmdline_LIBRARY}
${DPDK_rte_pmd_bond_LIBRARY}
${DPDK_rte_pmd_vmxnet3_uio_LIBRARY}
${DPDK_rte_pmd_ixgbe_LIBRARY}
${DPDK_rte_pmd_i40e_LIBRARY}
${DPDK_rte_pmd_ring_LIBRARY}
${DPDK_rte_pmd_af_packet_LIBRARY})
set(components
cmdline eal ethdev hash kvargs mbuf
mempool mempool_ring mempool_stack
pmd_bond pmd_vmxnet3_uio pmd_ixgbe pmd_i40e pmd_ring pmd_af_packet
ring)
mark_as_advanced(DPDK_INCLUDE_DIR
DPDK_rte_hash_LIBRARY
DPDK_rte_kvargs_LIBRARY
DPDK_rte_mbuf_LIBRARY
DPDK_rte_ethdev_LIBRARY
DPDK_rte_mempool_LIBRARY
DPDK_rte_ring_LIBRARY
DPDK_rte_eal_LIBRARY
DPDK_rte_cmdline_LIBRARY
DPDK_rte_pmd_bond_LIBRARY
DPDK_rte_pmd_vmxnet3_uio_LIBRARY
DPDK_rte_pmd_ixgbe_LIBRARY
DPDK_rte_pmd_i40e_LIBRARY
DPDK_rte_pmd_ring_LIBRARY
DPDK_rte_pmd_af_packet_LIBRARY)
foreach(c ${components})
find_library(DPDK_rte_${c}_LIBRARY rte_${c}
HINTS $ENV{DPDK_DIR}/lib)
endforeach()
foreach(c ${components})
list(APPEND check_LIBRARIES "${DPDK_rte_${c}_LIBRARY}")
endforeach()
mark_as_advanced(DPDK_INCLUDE_DIR ${check_LIBRARIES})
if (EXISTS ${WITH_DPDK_MLX5})
find_library(DPDK_rte_pmd_mlx5_LIBRARY rte_pmd_mlx5)
@ -67,9 +39,9 @@ find_package_handle_standard_args(dpdk DEFAULT_MSG
check_LIBRARIES)
if(DPDK_FOUND)
if (EXISTS ${WITH_DPDK_MLX5})
list(APPEND check_LIBRARIES -libverbs)
endif()
if(EXISTS ${WITH_DPDK_MLX5})
list(APPEND check_LIBRARIES -libverbs)
endif()
set(DPDK_LIBRARIES
-Wl,--whole-archive ${check_LIBRARIES} -Wl,--no-whole-archive)
endif(DPDK_FOUND)