diff options
author | Martin Braun <martin.braun@ettus.com> | 2018-06-09 22:42:47 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2018-06-11 12:13:46 -0700 |
commit | 526929071a43b820e6ee45961e0a10e605862e91 (patch) | |
tree | 182d6c879230e379474c5de5c8ff0142cf21a514 /host/lib/usrp | |
parent | e4f6565e5e0a979331f9d7847d93e78d1177c4f9 (diff) | |
download | uhd-526929071a43b820e6ee45961e0a10e605862e91.tar.gz uhd-526929071a43b820e6ee45961e0a10e605862e91.tar.bz2 uhd-526929071a43b820e6ee45961e0a10e605862e91.zip |
cmake: Add ENABLE_N300 target
Driver support for N310/N300 was previously implied by
ENABLE_MPMD, which had two issues:
1) It was not clear that ENABLE_MPMD was actually enabling
the N3x0
2) It did not allow to enable mpmd support without N3x0 support
This resolves these issues.
Diffstat (limited to 'host/lib/usrp')
-rw-r--r-- | host/lib/usrp/dboard/CMakeLists.txt | 8 | ||||
-rw-r--r-- | host/lib/usrp/dboard/eiscat/CMakeLists.txt | 13 | ||||
-rw-r--r-- | host/lib/usrp/dboard/magnesium/CMakeLists.txt | 27 |
3 files changed, 27 insertions, 21 deletions
diff --git a/host/lib/usrp/dboard/CMakeLists.txt b/host/lib/usrp/dboard/CMakeLists.txt index 6bca04290..83bb0a96c 100644 --- a/host/lib/usrp/dboard/CMakeLists.txt +++ b/host/lib/usrp/dboard/CMakeLists.txt @@ -46,5 +46,9 @@ IF(ENABLE_X300) ) ENDIF(ENABLE_X300) -INCLUDE_SUBDIRECTORY(magnesium) -INCLUDE_SUBDIRECTORY(eiscat) +IF(ENABLE_N300) + INCLUDE_SUBDIRECTORY(magnesium) +ENDIF(ENABLE_N300) +IF(ENABLE_MPMD AND ENABLE_EISCAT) + INCLUDE_SUBDIRECTORY(eiscat) +ENDIF(ENABLE_MPMD AND ENABLE_EISCAT) diff --git a/host/lib/usrp/dboard/eiscat/CMakeLists.txt b/host/lib/usrp/dboard/eiscat/CMakeLists.txt index 156e139fb..13da2d6da 100644 --- a/host/lib/usrp/dboard/eiscat/CMakeLists.txt +++ b/host/lib/usrp/dboard/eiscat/CMakeLists.txt @@ -4,10 +4,11 @@ # SPDX-License-Identifier: GPL-3.0 # -IF(ENABLE_MPMD AND ENABLE_EISCAT) - LIST(APPEND EISCAT_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/eiscat_radio_ctrl_impl.cpp - ) - LIBUHD_APPEND_SOURCES(${EISCAT_SOURCES}) -ENDIF(ENABLE_MPMD AND ENABLE_EISCAT) +# This file is conditionally included if ENABLE_MPMD and ENABLE_EISCAT are +# set to true. + +LIST(APPEND EISCAT_SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/eiscat_radio_ctrl_impl.cpp +) +LIBUHD_APPEND_SOURCES(${EISCAT_SOURCES}) diff --git a/host/lib/usrp/dboard/magnesium/CMakeLists.txt b/host/lib/usrp/dboard/magnesium/CMakeLists.txt index eca9e5234..417cd4f54 100644 --- a/host/lib/usrp/dboard/magnesium/CMakeLists.txt +++ b/host/lib/usrp/dboard/magnesium/CMakeLists.txt @@ -4,17 +4,18 @@ # SPDX-License-Identifier: GPL-3.0 # -IF(ENABLE_MPMD) - LIST(APPEND MAGNESIUM_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_radio_ctrl_impl.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_radio_ctrl_init.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_radio_ctrl_cpld.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_radio_ctrl_gain.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_ad9371_iface.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_bands.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_cpld_ctrl.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_gain_table.cpp - ) - LIBUHD_APPEND_SOURCES(${MAGNESIUM_SOURCES}) -ENDIF(ENABLE_MPMD) +# This file is conditionally included if ENABLE_MPMD and ENABLE_N300 are +# set to true. + +LIST(APPEND MAGNESIUM_SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_radio_ctrl_impl.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_radio_ctrl_init.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_radio_ctrl_cpld.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_radio_ctrl_gain.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_ad9371_iface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_bands.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_cpld_ctrl.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/magnesium_gain_table.cpp +) +LIBUHD_APPEND_SOURCES(${MAGNESIUM_SOURCES}) |