diff options
| -rw-r--r-- | host/examples/rfnoc-example/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/examples/rfnoc-example/apps/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | host/examples/rfnoc-example/blocks/CMakeLists.txt | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/host/examples/rfnoc-example/CMakeLists.txt b/host/examples/rfnoc-example/CMakeLists.txt index 27f96bfb2..738b5ae8e 100644 --- a/host/examples/rfnoc-example/CMakeLists.txt +++ b/host/examples/rfnoc-example/CMakeLists.txt @@ -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$") diff --git a/host/examples/rfnoc-example/apps/CMakeLists.txt b/host/examples/rfnoc-example/apps/CMakeLists.txt index db704b720..55b59bcfc 100644 --- a/host/examples/rfnoc-example/apps/CMakeLists.txt +++ b/host/examples/rfnoc-example/apps/CMakeLists.txt @@ -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 @@ -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 +#) diff --git a/host/examples/rfnoc-example/blocks/CMakeLists.txt b/host/examples/rfnoc-example/blocks/CMakeLists.txt index 046af2265..c86d14192 100644 --- a/host/examples/rfnoc-example/blocks/CMakeLists.txt +++ b/host/examples/rfnoc-example/blocks/CMakeLists.txt @@ -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 ) |