summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2012-11-14 15:00:51 -0800
committerJosh Blum <josh@joshknows.com>2012-11-14 15:00:51 -0800
commit4f4e571cef6a3cd64469901d654a1d4448e850d4 (patch)
tree69bd0d849871cd0a04e09cd89018d6348c7d9eb1
parentd809902ad340a2b45101b2fb03334ac50681526d (diff)
gr: misc test dependencies for new components
-rw-r--r--gr-atsc/src/python/CMakeLists.txt2
-rw-r--r--gr-channels/python/CMakeLists.txt2
-rw-r--r--gr-digital/lib/CMakeLists.txt3
-rw-r--r--gr-digital/python/CMakeLists.txt2
-rw-r--r--gr-trellis/src/python/CMakeLists.txt2
5 files changed, 6 insertions, 5 deletions
diff --git a/gr-atsc/src/python/CMakeLists.txt b/gr-atsc/src/python/CMakeLists.txt
index fa9f91156b..02bd5897dc 100644
--- a/gr-atsc/src/python/CMakeLists.txt
+++ b/gr-atsc/src/python/CMakeLists.txt
@@ -47,7 +47,7 @@ if(ENABLE_TESTING)
list(APPEND GR_TEST_PYTHON_DIRS
${CMAKE_BINARY_DIR}/gr-atsc/src/lib
)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-fec)
include(GrTest)
file(GLOB py_qa_test_files "qa_*.py")
diff --git a/gr-channels/python/CMakeLists.txt b/gr-channels/python/CMakeLists.txt
index c25d9eb2d9..ee58d5b164 100644
--- a/gr-channels/python/CMakeLists.txt
+++ b/gr-channels/python/CMakeLists.txt
@@ -38,7 +38,7 @@ list(APPEND GR_TEST_PYTHON_DIRS
${CMAKE_BINARY_DIR}/gr-analog/python
${CMAKE_BINARY_DIR}/gr-analog/swig
)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-channels)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-channels gnuradio-analog gnuradio-blocks)
include(GrTest)
file(GLOB py_qa_test_files "qa_*.py")
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index 7e1c174feb..5951d9e004 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -152,11 +152,12 @@ list(APPEND digital_libs
volk
gnuradio-core
gnuradio-filter
+ gnuradio-analog
${Boost_LIBRARIES}
)
add_library(gnuradio-digital SHARED ${digital_sources})
-target_link_libraries(gnuradio-digital ${digital_libs} gnuradio-analog)
+target_link_libraries(gnuradio-digital ${digital_libs})
GR_LIBRARY_FOO(gnuradio-digital RUNTIME_COMPONENT "digital_runtime" DEVEL_COMPONENT "digital_devel")
add_dependencies(gnuradio-digital
digital_generated_includes digital_generated_swigs
diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt
index 957e337200..2b12799b56 100644
--- a/gr-digital/python/CMakeLists.txt
+++ b/gr-digital/python/CMakeLists.txt
@@ -71,7 +71,7 @@ list(APPEND GR_TEST_PYTHON_DIRS
${CMAKE_BINARY_DIR}/gr-analog/python
${CMAKE_BINARY_DIR}/gr-analog/swig
)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-digital gnuradio-filter gnuradio-fft)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-digital gnuradio-filter gnuradio-fft gnuradio-analog)
include(GrTest)
file(GLOB py_qa_test_files "qa_*.py")
diff --git a/gr-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt
index b6167c905c..adc6b3a239 100644
--- a/gr-trellis/src/python/CMakeLists.txt
+++ b/gr-trellis/src/python/CMakeLists.txt
@@ -27,7 +27,7 @@ list(APPEND GR_TEST_PYTHON_DIRS
${CMAKE_BINARY_DIR}/gr-digital/swig
${CMAKE_BINARY_DIR}/gr-trellis/src/lib
)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-analog gnuradio-digital gnuradio-trellis)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-analog gnuradio-digital gnuradio-trellis gnuradio-filter)
include(GrPython)
include(GrTest)