aboutsummaryrefslogtreecommitdiffstats
path: root/mpm/lib
diff options
context:
space:
mode:
Diffstat (limited to 'mpm/lib')
-rw-r--r--mpm/lib/CMakeLists.txt16
-rw-r--r--mpm/lib/catalina/CMakeLists.txt24
-rw-r--r--mpm/lib/chips/CMakeLists.txt28
-rw-r--r--mpm/lib/i2c/CMakeLists.txt2
-rw-r--r--mpm/lib/mykonos/CMakeLists.txt16
-rw-r--r--mpm/lib/mykonos/adi/CMakeLists.txt2
-rw-r--r--mpm/lib/spi/CMakeLists.txt2
-rw-r--r--mpm/lib/types/CMakeLists.txt2
8 files changed, 46 insertions, 46 deletions
diff --git a/mpm/lib/CMakeLists.txt b/mpm/lib/CMakeLists.txt
index 615b60b67..51745c5f1 100644
--- a/mpm/lib/CMakeLists.txt
+++ b/mpm/lib/CMakeLists.txt
@@ -4,18 +4,18 @@
# SPDX-License-Identifier: GPL-3.0
#
-SET(UHD_HOST_ROOT ${CMAKE_SOURCE_DIR}/../host)
+set(UHD_HOST_ROOT ${CMAKE_SOURCE_DIR}/../host)
-ADD_SUBDIRECTORY(dboards)
-ADD_SUBDIRECTORY(chips)
-ADD_SUBDIRECTORY(spi)
-ADD_SUBDIRECTORY(i2c)
-ADD_SUBDIRECTORY(types)
+add_subdirectory(dboards)
+add_subdirectory(chips)
+add_subdirectory(spi)
+add_subdirectory(i2c)
+add_subdirectory(types)
if(ENABLE_MYKONOS)
- ADD_SUBDIRECTORY(mykonos)
+ add_subdirectory(mykonos)
elseif(ENABLE_E320)
- ADD_SUBDIRECTORY(catalina)
+ add_subdirectory(catalina)
endif(ENABLE_MYKONOS)
USRP_PERIPHS_ADD_OBJECT(periphs
diff --git a/mpm/lib/catalina/CMakeLists.txt b/mpm/lib/catalina/CMakeLists.txt
index 615843bea..b003387ee 100644
--- a/mpm/lib/catalina/CMakeLists.txt
+++ b/mpm/lib/catalina/CMakeLists.txt
@@ -8,23 +8,23 @@
# This file included, use CMake directory variables
########################################################################
-MACRO(CATALINA_APPEND_SOURCES)
- SET(catalina_sources ${catalina_sources})
- LIST(APPEND catalina_sources ${ARGV})
- SET(catalina_sources ${catalina_sources} PARENT_SCOPE)
-ENDMACRO(CATALINA_APPEND_SOURCES)
+macro(CATALINA_APPEND_SOURCES)
+ set(catalina_sources ${catalina_sources})
+ list(APPEND catalina_sources ${ARGV})
+ set(catalina_sources ${catalina_sources} PARENT_SCOPE)
+endmacro(CATALINA_APPEND_SOURCES)
-SET (CMAKE_CATALINA_SOURCE_DIR
+set (CMAKE_CATALINA_SOURCE_DIR
${UHD_HOST_ROOT}/lib/usrp/common
)
-CONFIGURE_FILE(
+configure_file(
${UHD_HOST_ROOT}/include/uhd/version.hpp.in
${CMAKE_BINARY_DIR}/include/uhd/version.hpp
)
# TODO: Do something better than listing all the files individually
-SET(catalina_sources
+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
@@ -39,12 +39,12 @@ SET(catalina_sources
USRP_PERIPHS_ADD_OBJECT(catalina ${catalina_sources})
-TARGET_INCLUDE_DIRECTORIES(catalina PUBLIC
+target_include_directories(catalina PUBLIC
$<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/include>)
-TARGET_INCLUDE_DIRECTORIES(catalina PUBLIC
+target_include_directories(catalina PUBLIC
$<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/usrp/common/ad9361_driver>)
-TARGET_INCLUDE_DIRECTORIES(catalina PUBLIC
+target_include_directories(catalina PUBLIC
$<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/include>)
-TARGET_INCLUDE_DIRECTORIES(dboards PUBLIC
+target_include_directories(dboards PUBLIC
$<BUILD_INTERFACE:${UHD_HOST_ROOT}/lib/usrp/common/ad9361_driver>)
diff --git a/mpm/lib/chips/CMakeLists.txt b/mpm/lib/chips/CMakeLists.txt
index 89f750fc0..ff4dbd723 100644
--- a/mpm/lib/chips/CMakeLists.txt
+++ b/mpm/lib/chips/CMakeLists.txt
@@ -4,39 +4,39 @@
# SPDX-License-Identifier: GPL-3.0
#
-#MACRO(ETTUS_PYTHON_GEN_SOURCE pyfile outfile)
+#macro(ETTUS_PYTHON_GEN_SOURCE pyfile outfile)
##ensure that the directory exists for outfile
- #GET_FILENAME_COMPONENT(outfile_dir ${outfile} PATH)
- #FILE(MAKE_DIRECTORY ${outfile_dir})
- #IF(NOT PYTHON_EXECUTABLE)
- #MESSAGE( FATAL_ERROR "No python executable found to generate ic_regmaps!" )
- #ENDIF(NOT PYTHON_EXECUTABLE)
+ #get_filename_component(outfile_dir ${outfile} PATH)
+ #file(MAKE_DIRECTORY ${outfile_dir})
+ #if(NOT PYTHON_EXECUTABLE)
+ #message( FATAL_ERROR "No python executable found to generate ic_regmaps!" )
+ #endif(NOT PYTHON_EXECUTABLE)
##make the outfile depend on the python script
- #ADD_CUSTOM_COMMAND(
+ #add_custom_command(
#OUTPUT ${outfile} DEPENDS ${pyfile} ${ETTUS_PYTHON_GEN_SOURCE_DEPS}
#COMMAND ${PYTHON_EXECUTABLE} -B ${pyfile} ${outfile}
#COMMENT "Generating ${outfile}"
#)
##make lmk04828 depend on the outfile
- #LIST(APPEND lmk04828_srcs ${ARGV})
-#ENDMACRO(ETTUS_PYTHON_GEN_SOURCE)
+ #list(APPEND lmk04828_srcs ${ARGV})
+#endmacro(ETTUS_PYTHON_GEN_SOURCE)
####################################################
# LMK04828
####################################################
# 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_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(ETTUS_PYTHON_GEN_SOURCE_DEPS ${UHD_IC_REG_MAP_PATH}/common.py)
+#set(ETTUS_PYTHON_GEN_SOURCE_DEPS ${UHD_IC_REG_MAP_PATH}/common.py)
#ETTUS_PYTHON_GEN_SOURCE(
#${UHD_IC_REG_MAP_PATH}/gen_lmk04828_regs.py
#${CMAKE_CURRENT_BINARY_DIR}/lmk04828_regs.hpp
#)
-#SET(LIBUHD_PYTHON_GEN_SOURCE_DEPS)
+#set(LIBUHD_PYTHON_GEN_SOURCE_DEPS)
# Define the object
#USRP_PERIPHS_ADD_OBJECT(chips
diff --git a/mpm/lib/i2c/CMakeLists.txt b/mpm/lib/i2c/CMakeLists.txt
index a6af95ff8..f083325a7 100644
--- a/mpm/lib/i2c/CMakeLists.txt
+++ b/mpm/lib/i2c/CMakeLists.txt
@@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
#
-SET(I2C_SOURCES
+set(I2C_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/i2cdev_iface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/i2c_regs_iface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/i2cdev.c
diff --git a/mpm/lib/mykonos/CMakeLists.txt b/mpm/lib/mykonos/CMakeLists.txt
index db6fbf517..166c039af 100644
--- a/mpm/lib/mykonos/CMakeLists.txt
+++ b/mpm/lib/mykonos/CMakeLists.txt
@@ -8,13 +8,13 @@
# This file included, use CMake directory variables
########################################################################
-MACRO(MYKONOS_APPEND_SOURCES)
- SET(mykonos_sources ${mykonos_sources})
- LIST(APPEND mykonos_sources ${ARGV})
- SET(mykonos_sources ${mykonos_sources} PARENT_SCOPE)
-ENDMACRO(MYKONOS_APPEND_SOURCES)
+macro(MYKONOS_APPEND_SOURCES)
+ set(mykonos_sources ${mykonos_sources})
+ list(APPEND mykonos_sources ${ARGV})
+ set(mykonos_sources ${mykonos_sources} PARENT_SCOPE)
+endmacro(MYKONOS_APPEND_SOURCES)
-SET(mykonos_sources
+set(mykonos_sources
${CMAKE_CURRENT_SOURCE_DIR}/ad937x_ctrl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ad937x_device.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ad937x_spi_iface.cpp
@@ -22,7 +22,7 @@ SET(mykonos_sources
${UHD_HOST_ROOT}/lib/types/ranges.cpp
)
-ADD_SUBDIRECTORY(adi)
-ADD_SUBDIRECTORY(config)
+add_subdirectory(adi)
+add_subdirectory(config)
USRP_PERIPHS_ADD_OBJECT(mykonos ${mykonos_sources})
diff --git a/mpm/lib/mykonos/adi/CMakeLists.txt b/mpm/lib/mykonos/adi/CMakeLists.txt
index 4bab71e05..dfdffd898 100644
--- a/mpm/lib/mykonos/adi/CMakeLists.txt
+++ b/mpm/lib/mykonos/adi/CMakeLists.txt
@@ -9,4 +9,4 @@ MYKONOS_APPEND_SOURCES(
${CMAKE_CURRENT_SOURCE_DIR}/mykonos_user.c
)
-ADD_SUBDIRECTORY(mykonos_debug)
+add_subdirectory(mykonos_debug)
diff --git a/mpm/lib/spi/CMakeLists.txt b/mpm/lib/spi/CMakeLists.txt
index ccc9597f9..d195c62b3 100644
--- a/mpm/lib/spi/CMakeLists.txt
+++ b/mpm/lib/spi/CMakeLists.txt
@@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: GPL-3.0
#
-SET(SPI_SOURCES
+set(SPI_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/spidev_iface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/spi_regs_iface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/spidev.c
diff --git a/mpm/lib/types/CMakeLists.txt b/mpm/lib/types/CMakeLists.txt
index dc97bc0e8..bbebca27e 100644
--- a/mpm/lib/types/CMakeLists.txt
+++ b/mpm/lib/types/CMakeLists.txt
@@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: GPL-3.0
#
-SET(TYPES_SOURCES
+set(TYPES_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/lockable.cpp
${CMAKE_CURRENT_SOURCE_DIR}/log_buf.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mmap_regs_iface.cpp