[Commit-gnuradio] [gnuradio] 04/05: cmake: fix component dependencies

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 6a68b9bbfd49531f696ae0ab6cc764fdabb94999
Author: Bastian Bloessl <address@hidden>
Date:   Sun Jan 29 10:48:46 2017 +0100

    cmake: fix component dependencies
---
 gr-analog/CMakeLists.txt     | 1 +
 gr-blocks/CMakeLists.txt     | 2 ++
 gr-blocks/lib/CMakeLists.txt | 1 -
 gr-dtv/CMakeLists.txt        | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt
index e0be42a..111f42c 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 685f573..5395924 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 4155958..cc42000 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 b57429d..9cca0b0 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