From 4a1ca9897b88390739dcfb12ba9cb0bfd019ccdc Mon Sep 17 00:00:00 2001 From: Piotr Krysik Date: Fri, 15 Jul 2016 13:39:19 +0200 Subject: [PATCH] Changes in the buildsystem for new blocks --- CMakeLists.txt | 6 +++--- lib/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e14c82..5832d42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,7 +101,7 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks) ######################################################################## # Find gnuradio build dependencies ######################################################################## -set(GR_REQUIRED_COMPONENTS RUNTIME PMT) +set(GR_REQUIRED_COMPONENTS RUNTIME FILTER PMT) find_package(Gnuradio) find_package(Volk) find_package(CppUnit) @@ -140,14 +140,14 @@ include_directories( ${CMAKE_BINARY_DIR}/include ${Boost_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} + ${GNURADIO_ALL_INCLUDE_DIRS} ${LIBOSMOCORE_INCLUDE_DIR} ) link_directories( ${Boost_LIBRARY_DIRS} ${CPPUNIT_LIBRARY_DIRS} - ${GNURADIO_RUNTIME_LIBRARY_DIRS} + ${GNURADIO_ALL_LIBRARY_DIRS} ) # Set component parameters diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index fb39f4c..35195e0 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -71,7 +71,7 @@ list(APPEND grgsm_sources add_library(grgsm SHARED ${grgsm_sources}) -target_link_libraries(grgsm ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES} ${LIBOSMOCORE_LIBRARIES} +target_link_libraries(grgsm ${Boost_LIBRARIES} ${GNURADIO_ALL_LIBRARIES} ${VOLK_LIBRARIES} ${LIBOSMOCORE_LIBRARIES} # libraries required by plotting.h - have troubles to be installed by pybombs # boost_iostreams # boost_system