Skip to content

Commit

Permalink
Examples: Fix install paths in OOT RFNoC example
Browse files Browse the repository at this point in the history
- Add missing "uhd/" subdirectory.
- Update install path for YAML file.
- Fix include directories and link libraries for init_gain_block.

Signed-off-by: michael-west <michael.west@ettus.com>
  • Loading branch information
michael-west committed Sep 13, 2020
1 parent 01e9f28 commit 7c02eb0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion host/examples/rfnoc-example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ project(rfnoc-example CXX C)
# Setup install directories
########################################################################
set(RFNOC_DATA_DIR share CACHE PATH "Base location for data")
set(RFNOC_PKG_DATA_DIR ${RFNOC_DATA_DIR}/rfnoc/ CACHE PATH "Path to install RFNoC package data")
set(RFNOC_PKG_DATA_DIR ${RFNOC_DATA_DIR}/uhd/rfnoc/ CACHE PATH "Path to install RFNoC package data")
set(PROJECT_DATA_DIR ${RFNOC_PKG_DATA_DIR}/example/ CACHE PATH "Path for this project's package data")

if(NOT DEFINED LIB_SUFFIX AND REDHAT AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$")
Expand Down
20 changes: 12 additions & 8 deletions host/examples/rfnoc-example/apps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,7 @@ endif(MSVC)
find_package(Boost 1.58 REQUIRED ${BOOST_REQUIRED_COMPONENTS})

include_directories(
${CMAKE_SOURCE_DIR}/lib
${CMAKE_SOURCE_DIR}/include
${CMAKE_BINARY_DIR}/lib
${CMAKE_BINARY_DIR}/include
${UHD_INCLUDE_DIRS}
${Boost_INCLUDE_DIR}
)
link_directories(
${Boost_LIBRARY_DIRS}
)

add_executable(init_gain_block
Expand All @@ -37,4 +29,16 @@ add_executable(init_gain_block
target_link_libraries(init_gain_block
${UHD_LIBRARIES}
${Boost_LIBRARIES}
-Wl,--no-as-needed
rfnoc-example
)

### Once it's built... ########################################################
# Here, you would have commands to install your program.
# We will skip these in this example.
#install(
# TARGETS init_gain_block
# RUNTIME
# DESTINATION ${PROJECT_DATA_DIR}
# COMPONENT apps
#)
2 changes: 1 addition & 1 deletion host/examples/rfnoc-example/blocks/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ file(GLOB yml_files "*.yml")
install(
FILES
${yml_files}
DESTINATION ${PROJECT_DATA_DIR}/blocks
DESTINATION ${RFNOC_PKG_DATA_DIR}/blocks
COMPONENT blocks
)

0 comments on commit 7c02eb0

Please sign in to comment.