diff options
| author | Martin Braun <martin.braun@ettus.com> | 2021-09-14 16:11:17 +0200 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-09-17 12:53:46 -0700 |
| commit | 9985dd7ac5837a8ab46032c9a3aee5fc463017ca (patch) | |
| tree | 3b0ad171b7751c090d0b65fb072ff5ca1030ab48 | |
| parent | 0ee2a409c4796f87d2d311356b775d437a5cc102 (diff) | |
| download | uhd-9985dd7ac5837a8ab46032c9a3aee5fc463017ca.tar.gz uhd-9985dd7ac5837a8ab46032c9a3aee5fc463017ca.tar.bz2 uhd-9985dd7ac5837a8ab46032c9a3aee5fc463017ca.zip | |
cmake: Fix rfnoc-example (CMake paths)
This reverts part of 09d94529e, which should not have touched these
particular CMake files.
| -rw-r--r-- | host/examples/rfnoc-example/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | host/examples/rfnoc-example/apps/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/examples/rfnoc-example/lib/CMakeLists.txt | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/host/examples/rfnoc-example/CMakeLists.txt b/host/examples/rfnoc-example/CMakeLists.txt index 4bd9db678..738b5ae8e 100644 --- a/host/examples/rfnoc-example/CMakeLists.txt +++ b/host/examples/rfnoc-example/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.8) project(rfnoc-example CXX C) #make sure our local CMake Modules path comes first -#list(INSERT CMAKE_MODULE_PATH 0 ${UHD_SOURCE_DIR}/cmake/Modules) +#list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) #install to PyBOMBS target prefix if defined #if(DEFINED ENV{PYBOMBS_PREFIX}) @@ -37,8 +37,8 @@ find_package(UnixCommands) if(BASH) message(STATUS "Found bash interpreter: ${BASH}") configure_file( - ${UHD_SOURCE_DIR}/cmake/Modules/run_testbench.sh.in - ${UHD_BINARY_DIR}/cmake/Modules/run_testbench.sh + ${CMAKE_SOURCE_DIR}/cmake/Modules/run_testbench.sh.in + ${CMAKE_BINARY_DIR}/cmake/Modules/run_testbench.sh @ONLY ) else() @@ -98,7 +98,7 @@ macro(RFNOC_ADD_TB_DIR) set(_target_name "${_tb_dir}_tb") message(STATUS "Adding testbench target: ${_target_name}") add_custom_target(${_target_name} - COMMAND ${UHD_BINARY_DIR}/cmake/Modules/run_testbench.sh ${UHD_FPGA_DIR} ${UHD_FPGA_DEFAULT_DEVICE} ${CMAKE_CURRENT_SOURCE_DIR} xsim + COMMAND ${CMAKE_BINARY_DIR}/cmake/Modules/run_testbench.sh ${UHD_FPGA_DIR} ${UHD_FPGA_DEFAULT_DEVICE} ${CMAKE_CURRENT_SOURCE_DIR} xsim ) add_dependencies(testbenches ${_target_name}) endif() @@ -138,7 +138,7 @@ macro(RFNOC_REGISTER_IMAGE_CORE) if (_rfnoc_image_builder_exe) message(STATUS "Adding image core target: ${_target_name}") add_custom_target(${_target_name} - COMMAND ${_rfnoc_image_builder_exe} -F ${UHD_FPGA_DIR} -y ${CMAKE_CURRENT_SOURCE_DIR}/${_rfnoc_image_core_SRC} -I ${UHD_SOURCE_DIR} + COMMAND ${_rfnoc_image_builder_exe} -F ${UHD_FPGA_DIR} -y ${CMAKE_CURRENT_SOURCE_DIR}/${_rfnoc_image_core_SRC} -I ${CMAKE_SOURCE_DIR} ) endif() endmacro() @@ -147,7 +147,7 @@ endmacro() # Create uninstall target ######################################################################## configure_file( - ${UHD_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in + ${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake @ONLY) add_custom_target(uninstall diff --git a/host/examples/rfnoc-example/apps/CMakeLists.txt b/host/examples/rfnoc-example/apps/CMakeLists.txt index ea9dafd71..bca9336ce 100644 --- a/host/examples/rfnoc-example/apps/CMakeLists.txt +++ b/host/examples/rfnoc-example/apps/CMakeLists.txt @@ -20,7 +20,7 @@ endif(MSVC) find_package(Boost 1.65 REQUIRED ${BOOST_REQUIRED_COMPONENTS}) include_directories( - ${UHD_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/include ) add_executable(init_gain_block diff --git a/host/examples/rfnoc-example/lib/CMakeLists.txt b/host/examples/rfnoc-example/lib/CMakeLists.txt index 8b447723d..45b5c9b03 100644 --- a/host/examples/rfnoc-example/lib/CMakeLists.txt +++ b/host/examples/rfnoc-example/lib/CMakeLists.txt @@ -23,10 +23,10 @@ endif() # Setup the include and linker paths ######################################################################## include_directories( - ${UHD_SOURCE_DIR}/lib - ${UHD_SOURCE_DIR}/include - ${UHD_BINARY_DIR}/lib - ${UHD_BINARY_DIR}/include + ${CMAKE_SOURCE_DIR}/lib + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_BINARY_DIR}/lib + ${CMAKE_BINARY_DIR}/include ${UHD_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} ) |