diff options
| author | Dimitri Stolnikov <horiz0n@gmx.net> | 2014-08-26 00:09:15 +0200 |
|---|---|---|
| committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2014-08-26 00:09:15 +0200 |
| commit | 16cd02de84ca1c0c294c90049b78be2bad182feb (patch) | |
| tree | 866cddb3ad5721d9be4a245f84aba6425e72ed3d /CMakeLists.txt | |
| parent | ab582493dd41943bd3db81dee12f85600139d1a8 (diff) | |
cmake: update from gnuradio master
- Update the GrXXX modules from the GNURadio master
- Force 3.7.3 since previous FindGnuradio was broken
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index edf87ab..87b51d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,7 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks) # Find build dependencies ######################################################################## set(GR_REQUIRED_COMPONENTS RUNTIME PMT BLOCKS) -find_package(Gnuradio "3.7.0") +find_package(Gnuradio 3.7.3 REQUIRED) find_package(GnuradioIQBalance) find_package(UHD) find_package(GnuradioUHD) @@ -173,16 +173,12 @@ include_directories( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/lib ${Boost_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${GNURADIO_PMT_INCLUDE_DIRS} - ${GNURADIO_BLOCKS_INCLUDE_DIRS} + ${GNURADIO_ALL_INCLUDE_DIRS} ) link_directories( ${Boost_LIBRARY_DIRS} - ${GNURADIO_RUNTIME_LIBRARY_DIRS} - ${GNURADIO_PMT_LIBRARY_DIRS} - ${GNURADIO_BLOCKS_LIBRARY_DIRS} + ${GNURADIO_ALL_LIBRARY_DIRS} ) # Set component parameters |