diff options
| author | Alex Williams <alex.williams@ni.com> | 2020-01-14 15:35:42 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2020-01-22 12:52:35 -0800 |
| commit | 9450345649f5d502cca89658f674161a5f45a376 (patch) | |
| tree | 88ef8e60e7b8113011436e8ae01e8c5caa188dc0 /host/lib | |
| parent | a09dad7fc6da3fe0c8b6e64b6187bb8b15191ccf (diff) | |
| download | uhd-9450345649f5d502cca89658f674161a5f45a376.tar.gz uhd-9450345649f5d502cca89658f674161a5f45a376.tar.bz2 uhd-9450345649f5d502cca89658f674161a5f45a376.zip | |
cmake: Find DPDK via pkg-config, if available
Debian uses pkg-config without the libdpdk.so linker script. Use
the pkg-config file to grab the installed libraries and determine
what to link to.
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/transport/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/lib/transport/uhd-dpdk/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/lib/usrp/mpmd/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | host/lib/usrp/x300/CMakeLists.txt | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt index d88631ae3..2b1378978 100644 --- a/host/lib/transport/CMakeLists.txt +++ b/host/lib/transport/CMakeLists.txt @@ -143,6 +143,7 @@ endif(ENABLE_LIBERIO) if(ENABLE_DPDK) INCLUDE_SUBDIRECTORY(uhd-dpdk) + include_directories(${DPDK_INCLUDE_DIRS}) LIBUHD_APPEND_SOURCES( ${CMAKE_CURRENT_SOURCE_DIR}/udp_dpdk_link.cpp diff --git a/host/lib/transport/uhd-dpdk/CMakeLists.txt b/host/lib/transport/uhd-dpdk/CMakeLists.txt index a13886653..c19fcae78 100644 --- a/host/lib/transport/uhd-dpdk/CMakeLists.txt +++ b/host/lib/transport/uhd-dpdk/CMakeLists.txt @@ -26,7 +26,7 @@ if(ENABLE_DPDK) ${CMAKE_CURRENT_SOURCE_DIR}/dpdk_io_service.cpp PROPERTIES COMPILE_FLAGS "${UHD_DPDK_CFLAGS} -D_GNU_SOURCE" ) - include_directories(${DPDK_INCLUDE_DIR}) + include_directories(${DPDK_INCLUDE_DIRS}) LIBUHD_APPEND_LIBS(${DPDK_LIBRARIES}) endif(ENABLE_DPDK) diff --git a/host/lib/usrp/mpmd/CMakeLists.txt b/host/lib/usrp/mpmd/CMakeLists.txt index 1eab1f39b..5a6ce72c1 100644 --- a/host/lib/usrp/mpmd/CMakeLists.txt +++ b/host/lib/usrp/mpmd/CMakeLists.txt @@ -25,11 +25,12 @@ if(ENABLE_MPMD) ) set_property( SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_link_if_mgr.cpp - PROPERTY COMPILE_DEFINITIONS HAVE_LIBERIO + PROPERTY COMPILE_DEFINITIONS HAVE_LIBERIO ) endif(ENABLE_LIBERIO) if(ENABLE_DPDK) + include_directories(${DPDK_INCLUDE_DIRS}) set_property( SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_link_if_ctrl_udp.cpp diff --git a/host/lib/usrp/x300/CMakeLists.txt b/host/lib/usrp/x300/CMakeLists.txt index b00ee357c..d5a7eee4f 100644 --- a/host/lib/usrp/x300/CMakeLists.txt +++ b/host/lib/usrp/x300/CMakeLists.txt @@ -37,6 +37,7 @@ if(ENABLE_X300) ) if(ENABLE_DPDK) + include_directories(${DPDK_INCLUDE_DIRS}) add_definitions(-DHAVE_DPDK) endif(ENABLE_DPDK) endif(ENABLE_X300) |