diff options
Diffstat (limited to 'mpm/lib')
| -rw-r--r-- | mpm/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | mpm/lib/catalina/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | mpm/lib/chips/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | mpm/lib/mykonos/CMakeLists.txt | 2 |
4 files changed, 21 insertions, 21 deletions
diff --git a/mpm/lib/CMakeLists.txt b/mpm/lib/CMakeLists.txt index f127af0a6..c46a3da40 100644 --- a/mpm/lib/CMakeLists.txt +++ b/mpm/lib/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -set(UHD_HOST_ROOT ${CMAKE_SOURCE_DIR}/../host) +set(UHD_SOURCE_DIR ${CMAKE_SOURCE_DIR}/../host) add_subdirectory(dboards) add_subdirectory(chips) @@ -24,7 +24,7 @@ endif(ENABLE_X400) USRP_PERIPHS_ADD_OBJECT(periphs exception.cpp - ${UHD_HOST_ROOT}/lib/exception.cpp + ${UHD_SOURCE_DIR}/lib/exception.cpp ) # vim: set sw=4 et: diff --git a/mpm/lib/catalina/CMakeLists.txt b/mpm/lib/catalina/CMakeLists.txt index 7780b738e..d04b4d93e 100644 --- a/mpm/lib/catalina/CMakeLists.txt +++ b/mpm/lib/catalina/CMakeLists.txt @@ -15,7 +15,7 @@ macro(CATALINA_APPEND_SOURCES) endmacro(CATALINA_APPEND_SOURCES) set (CMAKE_CATALINA_SOURCE_DIR - ${UHD_HOST_ROOT}/lib/usrp/common + ${UHD_SOURCE_DIR}/lib/usrp/common ) ######################################################################## @@ -26,7 +26,7 @@ message(STATUS " Priority scheduling disabled.") set(THREAD_PRIO_DEFS HAVE_THREAD_PRIO_DUMMY) set_source_files_properties( - ${UHD_HOST_ROOT}/lib/utils/thread.cpp + ${UHD_SOURCE_DIR}/lib/utils/thread.cpp PROPERTIES COMPILE_DEFINITIONS "${THREAD_PRIO_DEFS}" ) @@ -34,11 +34,11 @@ set_source_files_properties( # Setup UHD_VERSION and UHD_COMPONENT for version.cpp ######################################################################## configure_file( - ${UHD_HOST_ROOT}/include/uhd/version.hpp.in + ${UHD_SOURCE_DIR}/include/uhd/version.hpp.in ${CMAKE_BINARY_DIR}/include/uhd/version.hpp ) configure_file( - ${UHD_HOST_ROOT}/lib/version.cpp + ${UHD_SOURCE_DIR}/lib/version.cpp ${CMAKE_BINARY_DIR}/lib/version.cpp ) @@ -47,24 +47,24 @@ set(catalina_sources ${CMAKE_CATALINA_SOURCE_DIR}/ad9361_ctrl.cpp ${CMAKE_CATALINA_SOURCE_DIR}/ad936x_manager.cpp ${CMAKE_CATALINA_SOURCE_DIR}/ad9361_driver/ad9361_device.cpp - ${UHD_HOST_ROOT}/lib/types/filters.cpp - ${UHD_HOST_ROOT}/lib/types/ranges.cpp - ${UHD_HOST_ROOT}/lib/types/sensors.cpp - ${UHD_HOST_ROOT}/lib/types/serial.cpp - ${UHD_HOST_ROOT}/lib/property_tree.cpp - ${UHD_HOST_ROOT}/lib/utils/log.cpp - ${UHD_HOST_ROOT}/lib/utils/thread.cpp + ${UHD_SOURCE_DIR}/lib/types/filters.cpp + ${UHD_SOURCE_DIR}/lib/types/ranges.cpp + ${UHD_SOURCE_DIR}/lib/types/sensors.cpp + ${UHD_SOURCE_DIR}/lib/types/serial.cpp + ${UHD_SOURCE_DIR}/lib/property_tree.cpp + ${UHD_SOURCE_DIR}/lib/utils/log.cpp + ${UHD_SOURCE_DIR}/lib/utils/thread.cpp ${CMAKE_BINARY_DIR}/lib/version.cpp ) USRP_PERIPHS_ADD_OBJECT(catalina ${catalina_sources}) target_include_directories(catalina PUBLIC - $<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/include>) + $<BUILD_INTERFACE:${UHD_SOURCE_DIR}/lib/include>) target_include_directories(catalina PUBLIC - $<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/usrp/common/ad9361_driver>) + $<BUILD_INTERFACE:${UHD_SOURCE_DIR}/lib/usrp/common/ad9361_driver>) target_include_directories(catalina PUBLIC - $<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/include>) + $<BUILD_INTERFACE:${UHD_SOURCE_DIR}/lib/include>) target_include_directories(dboards PUBLIC - $<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/usrp/common/ad9361_driver>) + $<BUILD_INTERFACE:${UHD_SOURCE_DIR}/lib/usrp/common/ad9361_driver>) diff --git a/mpm/lib/chips/CMakeLists.txt b/mpm/lib/chips/CMakeLists.txt index c03ace9f4..ba3060673 100644 --- a/mpm/lib/chips/CMakeLists.txt +++ b/mpm/lib/chips/CMakeLists.txt @@ -27,9 +27,9 @@ #################################################### # Register definitions need to be generated -#set(UHD_HOST_ROOT ${CMAKE_SOURCE_DIR}/../host) -#message("uhd host root: ${UHD_HOST_ROOT}") -#set(UHD_IC_REG_MAP_PATH ${UHD_HOST_ROOT}/lib/ic_reg_maps) +#set(UHD_SOURCE_DIR ${CMAKE_SOURCE_DIR}/../host) +#message("uhd host root: ${UHD_SOURCE_DIR}") +#set(UHD_IC_REG_MAP_PATH ${UHD_SOURCE_DIR}/lib/ic_reg_maps) #set(ETTUS_PYTHON_GEN_SOURCE_DEPS ${UHD_IC_REG_MAP_PATH}/common.py) #ETTUS_PYTHON_GEN_SOURCE( diff --git a/mpm/lib/mykonos/CMakeLists.txt b/mpm/lib/mykonos/CMakeLists.txt index 0cfe7f412..4d167ae80 100644 --- a/mpm/lib/mykonos/CMakeLists.txt +++ b/mpm/lib/mykonos/CMakeLists.txt @@ -19,7 +19,7 @@ set(mykonos_sources ${CMAKE_CURRENT_SOURCE_DIR}/ad937x_device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ad937x_spi_iface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/adi_ctrl.cpp - ${UHD_HOST_ROOT}/lib/types/ranges.cpp + ${UHD_SOURCE_DIR}/lib/types/ranges.cpp ) add_subdirectory(adi) |