diff options
| author | Bastian Bloessl <mail@bastibl.net> | 2017-01-29 10:48:46 +0100 |
|---|---|---|
| committer | Bastian Bloessl <mail@bastibl.net> | 2017-03-22 13:26:17 +0100 |
| commit | 6a68b9bbfd49531f696ae0ab6cc764fdabb94999 (patch) | |
| tree | 4f58792ba49fc54bac97385bcb1f5549d0694d2f | |
| parent | 4433a7703fe3f5713c2200a0f7c11b13510f34cc (diff) | |
cmake: fix component dependencies
| -rw-r--r-- | gr-analog/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-blocks/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-dtv/CMakeLists.txt | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt index e0be42a0a5..111f42c4ed 100644 --- a/gr-analog/CMakeLists.txt +++ b/gr-analog/CMakeLists.txt @@ -30,6 +30,7 @@ GR_REGISTER_COMPONENT("gr-analog" ENABLE_GR_ANALOG Boost_FOUND ENABLE_VOLK ENABLE_GNURADIO_RUNTIME + ENABLE_GR_BLOCKS ENABLE_GR_FFT ENABLE_GR_FILTER ) diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt index 685f5736fb..539592419a 100644 --- a/gr-blocks/CMakeLists.txt +++ b/gr-blocks/CMakeLists.txt @@ -28,6 +28,7 @@ include(GrBoost) include(GrComponent) GR_REGISTER_COMPONENT("gr-blocks" ENABLE_GR_BLOCKS Boost_FOUND + ENABLE_VOLK ENABLE_GNURADIO_RUNTIME ) @@ -36,6 +37,7 @@ GR_SET_GLOBAL(GR_BLOCKS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR}/include + ${VOLK_INCLUDE_DIRS} ) ######################################################################## diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 4155958bc2..cc420002d1 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -65,7 +65,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/../include ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${VOLK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt index b57429dea7..9cca0b0f5c 100644 --- a/gr-dtv/CMakeLists.txt +++ b/gr-dtv/CMakeLists.txt @@ -36,6 +36,7 @@ GR_REGISTER_COMPONENT("gr-dtv" ENABLE_GR_DTV ENABLE_GR_ANALOG ENABLE_GR_FILTER ENABLE_GR_FEC + ENABLE_VOLK ) GR_SET_GLOBAL(GR_DTV_INCLUDE_DIRS |