diff options
| author | Martin Braun <martin.braun@ettus.com> | 2021-09-02 11:38:05 +0200 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-09-10 15:08:10 -0500 |
| commit | 09d94529e5dbfa992cb6012cc0dc38d6f3e7d57d (patch) | |
| tree | f632274ec4af60e1559a361bd2b607cc65e9d5f7 /mpm/python | |
| parent | e64d3e28316f642c1203722b6f5f2af710a7e281 (diff) | |
| download | uhd-09d94529e5dbfa992cb6012cc0dc38d6f3e7d57d.tar.gz uhd-09d94529e5dbfa992cb6012cc0dc38d6f3e7d57d.tar.bz2 uhd-09d94529e5dbfa992cb6012cc0dc38d6f3e7d57d.zip | |
cmake: Replace CMAKE_{SOURCE,BINARY}_DIR with UHD_*_DIR
See the CMake 3.8 documentation on these two variables:
https://cmake.org/cmake/help/v3.8/variable/PROJECT-NAME_SOURCE_DIR.html
https://cmake.org/cmake/help/v3.8/variable/CMAKE_SOURCE_DIR.html
Under normal circumstances, these two are identical. For sub-projects
(i.e., when building UHD as part of something else that is also a CMake
project), only the former is useful. There is no discernible downside of
using UHD_SOURCE_DIR over CMAKE_SOURCE_DIR.
This was changed using sed:
$ sed -i "s/CMAKE_SOURCE_DIR/UHD_SOURCE_DIR/g" \
`ag -l CMAKE_SOURCE_DIR **/{CMakeLists.txt,*.cmake}`
$ sed -i "s/CMAKE_BINARY_DIR/UHD_BINARY_DIR/g" \
`ag -l CMAKE_BINARY_DIR **/{CMakeLists.txt,*.cmake}`
At the same time, we also replace the CMake variable UHD_HOST_ROOT (used
in MPM) with UHD_SOURCE_DIR. There's no reason to have two variables
with the same meaning and different names, but more importantly, this
means that UHD_SOURCE_DIR is defined even in those cases where MPM calls
into CMake files from UHD without any additional patches.
Shoutout to GitHub user marcobergamin for bringing this up.
Diffstat (limited to 'mpm/python')
| -rw-r--r-- | mpm/python/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | mpm/python/usrp_mpm/chips/ic_reg_maps/CMakeLists.txt | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mpm/python/CMakeLists.txt b/mpm/python/CMakeLists.txt index 9041347e1..b15578484 100644 --- a/mpm/python/CMakeLists.txt +++ b/mpm/python/CMakeLists.txt @@ -63,9 +63,9 @@ if(NOT ENABLE_SIM) target_include_directories(pyusrp_periphs PUBLIC ${PYTHON_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/lib/ - ${UHD_HOST_ROOT}/lib/usrp/common - ${UHD_HOST_ROOT}/lib/usrp/common/ad9361_driver - ${UHD_HOST_ROOT}/lib/deps/pybind11/include + ${UHD_SOURCE_DIR}/lib/usrp/common + ${UHD_SOURCE_DIR}/lib/usrp/common/ad9361_driver + ${UHD_SOURCE_DIR}/lib/deps/pybind11/include ) target_link_libraries(pyusrp_periphs ${Boost_LIBRARIES} usrp-periphs) add_custom_command(TARGET pyusrp_periphs POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libpyusrp_periphs.so ${CMAKE_CURRENT_BINARY_DIR}/usrp_mpm/libpyusrp_periphs.so) diff --git a/mpm/python/usrp_mpm/chips/ic_reg_maps/CMakeLists.txt b/mpm/python/usrp_mpm/chips/ic_reg_maps/CMakeLists.txt index 1a49daef6..61b836700 100755 --- a/mpm/python/usrp_mpm/chips/ic_reg_maps/CMakeLists.txt +++ b/mpm/python/usrp_mpm/chips/ic_reg_maps/CMakeLists.txt @@ -27,19 +27,19 @@ endmacro(REG_MAPS_GEN_SOURCE) if(ENABLE_REGMAPS) # designate the file which will be used to generate all reg maps - set(REG_MAPS_GEN_SOURCE_DEPS ${UHD_HOST_ROOT}/lib/ic_reg_maps/common.py) + set(REG_MAPS_GEN_SOURCE_DEPS ${UHD_SOURCE_DIR}/lib/ic_reg_maps/common.py) # specify all reg maps you wish to generate REG_MAPS_GEN_SOURCE( - ${UHD_HOST_ROOT}/lib/ic_reg_maps/gen_lmk04816_regs.py + ${UHD_SOURCE_DIR}/lib/ic_reg_maps/gen_lmk04816_regs.py ${CMAKE_CURRENT_BINARY_DIR}/lmk04816_regs.py ) REG_MAPS_GEN_SOURCE( - ${UHD_HOST_ROOT}/lib/ic_reg_maps/gen_lmx2572_regs.py + ${UHD_SOURCE_DIR}/lib/ic_reg_maps/gen_lmx2572_regs.py ${CMAKE_CURRENT_BINARY_DIR}/lmx2572_regs.py ) REG_MAPS_GEN_SOURCE( - ${UHD_HOST_ROOT}/lib/ic_reg_maps/gen_zbx_cpld_regs.py + ${UHD_SOURCE_DIR}/lib/ic_reg_maps/gen_zbx_cpld_regs.py ${CMAKE_CURRENT_BINARY_DIR}/zbx_cpld_regs.py ) |