diff options
| -rw-r--r-- | host/lib/transport/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/lib/transport/uhd-dpdk/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | host/lib/usrp/mpmd/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | host/tests/CMakeLists.txt | 19 |
4 files changed, 8 insertions, 40 deletions
diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt index d39ca7336..646b2837e 100644 --- a/host/lib/transport/CMakeLists.txt +++ b/host/lib/transport/CMakeLists.txt @@ -143,9 +143,5 @@ endif(ENABLE_LIBERIO) if(ENABLE_DPDK) INCLUDE_SUBDIRECTORY(uhd-dpdk) - LIBUHD_APPEND_SOURCES( - ${CMAKE_CURRENT_SOURCE_DIR}/dpdk_zero_copy.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dpdk_simple.cpp - ) endif(ENABLE_DPDK) diff --git a/host/lib/transport/uhd-dpdk/CMakeLists.txt b/host/lib/transport/uhd-dpdk/CMakeLists.txt index 01cd0957c..ea78aa1e8 100644 --- a/host/lib/transport/uhd-dpdk/CMakeLists.txt +++ b/host/lib/transport/uhd-dpdk/CMakeLists.txt @@ -18,19 +18,9 @@ if(ENABLE_DPDK) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) LIBUHD_APPEND_SOURCES( - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_dpdk.c - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_dpdk_driver.c - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_dpdk_fops.c - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_dpdk_udp.c - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_dpdk_wait.c ${CMAKE_CURRENT_SOURCE_DIR}/dpdk_common.cpp ) set_source_files_properties( - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_dpdk.c - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_dpdk_driver.c - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_dpdk_fops.c - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_dpdk_udp.c - ${CMAKE_CURRENT_SOURCE_DIR}/uhd_dpdk_wait.c ${CMAKE_CURRENT_SOURCE_DIR}/dpdk_common.cpp PROPERTIES COMPILE_FLAGS "${UHD_DPDK_CFLAGS} -D_GNU_SOURCE" ) diff --git a/host/lib/usrp/mpmd/CMakeLists.txt b/host/lib/usrp/mpmd/CMakeLists.txt index 18c9c6cbd..ce06913a3 100644 --- a/host/lib/usrp/mpmd/CMakeLists.txt +++ b/host/lib/usrp/mpmd/CMakeLists.txt @@ -11,8 +11,9 @@ if(ENABLE_MPMD) endif(ENABLE_LIBERIO) if(ENABLE_DPDK) - message(STATUS "Compiling MPMD with DPDK support...") - add_definitions(-DHAVE_DPDK) + message(STATUS "Compiling MPMD without DPDK support for now...") + # message(STATUS "Compiling MPMD with DPDK support...") + # add_definitions(-DHAVE_DPDK) endif(ENABLE_DPDK) LIBUHD_APPEND_SOURCES( @@ -33,10 +34,10 @@ if(ENABLE_MPMD) ) endif(ENABLE_LIBERIO) - if(ENABLE_DPDK) - LIBUHD_APPEND_SOURCES( - ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_link_if_ctrl_dpdk_udp.cpp - ) - endif(ENABLE_DPDK) + # if(ENABLE_DPDK) + # LIBUHD_APPEND_SOURCES( + # ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_link_if_ctrl_dpdk_udp.cpp + # ) + # endif(ENABLE_DPDK) endif(ENABLE_MPMD) diff --git a/host/tests/CMakeLists.txt b/host/tests/CMakeLists.txt index 89d0926fa..4578a6307 100644 --- a/host/tests/CMakeLists.txt +++ b/host/tests/CMakeLists.txt @@ -115,25 +115,6 @@ endmacro(UHD_ADD_NONAPI_TEST) ############################################################################### # Now add all unit tests that require special linkage ############################################################################### -if(ENABLE_DPDK) - find_package(DPDK) - UHD_ADD_NONAPI_TEST( - TARGET "dpdk_test.cpp" - EXTRA_SOURCES - ${CMAKE_SOURCE_DIR}/lib/utils/config_parser.cpp - ${CMAKE_SOURCE_DIR}/lib/utils/paths.cpp - ${CMAKE_SOURCE_DIR}/lib/utils/pathslib.cpp - ${CMAKE_SOURCE_DIR}/lib/utils/prefs.cpp - ${CMAKE_SOURCE_DIR}/lib/transport/dpdk_zero_copy.cpp - INCLUDE_DIRS - ${DPDK_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/lib/transport/ - ${CMAKE_SOURCE_DIR}/lib/transport/ - EXTRA_LIBS ${DPDK_LIBRARIES} - NOAUTORUN # Don't register for auto-run, it requires special config - ) -ENDIF(ENABLE_DPDK) - UHD_ADD_NONAPI_TEST( TARGET "system_time_test.cpp" EXTRA_SOURCES |