gr: set a common GR_TEST_TARGET_DEPS for all module unit tests

Each unit test shares common dependencies,
but we have been neglecting to set these.

In this changeset, we set one top level GR_TEST_TARGET_DEPS,
and simply append module-specific dependencies for each test.

This also helps to fix QA tests on windows
which were missing the dependencies list.

Conflicts:

	gr-analog/python/CMakeLists.txt
	gr-blocks/python/CMakeLists.txt

16 files changed, 18 insertions, 15 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d946693ef..533daa002 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,6 +229,9 @@ add_subdirectory(gruel)
 add_subdirectory(gnuradio-core)
 add_subdirectory(grc)
 
+#the following dependency libraries are needed by all gr modules:
+list(APPEND GR_TEST_TARGET_DEPS volk gruel gnuradio-core)
+
 add_subdirectory(gr-fft)
 add_subdirectory(gr-filter)
 add_subdirectory(gr-atsc)
diff --git a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
index 3e75ead03..325072d82 100644
--- a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
+++ b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
@@ -46,7 +46,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
         ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
     )
-    set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core)
+    list(APPEND GR_TEST_TARGET_DEPS)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gnuradio-core/src/tests/CMakeLists.txt b/gnuradio-core/src/tests/CMakeLists.txt
index 3c7f632b3..680141e7b 100644
--- a/gnuradio-core/src/tests/CMakeLists.txt
+++ b/gnuradio-core/src/tests/CMakeLists.txt
@@ -63,7 +63,7 @@ endforeach(test_not_run_src)
 # Set the test environment so the build libs will be found under MSVC.
 ########################################################################
 include(GrTest)
-set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core test-gnuradio-core)
+list(APPEND GR_TEST_TARGET_DEPS test-gnuradio-core)
 add_executable(gr_core_test_all test_all.cc)
 target_link_libraries(gr_core_test_all test-gnuradio-core)
 GR_ADD_TEST(gr-core-test-all gr_core_test_all)
diff --git a/gr-atsc/src/lib/CMakeLists.txt b/gr-atsc/src/lib/CMakeLists.txt
index 39dbefa60..8c67d9028 100644
--- a/gr-atsc/src/lib/CMakeLists.txt
+++ b/gr-atsc/src/lib/CMakeLists.txt
@@ -129,7 +129,7 @@ list(APPEND test_atsci_sources
 )
 
 include(GrTest)
-set(GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-core gruel volk)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc)
 add_executable(test_atsci ${test_atsci_sources} test_atsci.cc)
 target_link_libraries(test_atsci gnuradio-atsc gnuradio-core ${CPPUNIT_LIBRARIES})
 GR_ADD_TEST(atsci-test test_atsci)
diff --git a/gr-atsc/src/python/CMakeLists.txt b/gr-atsc/src/python/CMakeLists.txt
index d38d6d803..df3da4731 100644
--- a/gr-atsc/src/python/CMakeLists.txt
+++ b/gr-atsc/src/python/CMakeLists.txt
@@ -52,7 +52,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
         ${CMAKE_BINARY_DIR}/gr-atsc/src/lib
     )
-    set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-atsc)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 8c4834115..0ef429a7d 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -109,7 +109,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
         ${CMAKE_BINARY_DIR}/gr-comedi/src
     )
-    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-comedi)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-comedi)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING AND ENABLE_PYTHON)
diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt
index 6a9f10295..8bba47686 100644
--- a/gr-digital/python/CMakeLists.txt
+++ b/gr-digital/python/CMakeLists.txt
@@ -72,7 +72,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-digital/python
         ${CMAKE_BINARY_DIR}/gr-digital/swig
     )
-    set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-digital)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-digital gnuradio-filter)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gr-fcd/python/CMakeLists.txt b/gr-fcd/python/CMakeLists.txt
index 9e59e643f..0ecb2ac5a 100644
--- a/gr-fcd/python/CMakeLists.txt
+++ b/gr-fcd/python/CMakeLists.txt
@@ -41,7 +41,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-fcd/python
         ${CMAKE_BINARY_DIR}/gr-fcd/swig
     )
-    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-audio gnuradio-fcd)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-audio gnuradio-fcd)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gr-fft/python/CMakeLists.txt b/gr-fft/python/CMakeLists.txt
index c64df4659..1e354d7a2 100644
--- a/gr-fft/python/CMakeLists.txt
+++ b/gr-fft/python/CMakeLists.txt
@@ -41,7 +41,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-fft/python
         ${CMAKE_BINARY_DIR}/gr-fft/swig
     )
-    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-fft)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-fft)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gr-filter/python/CMakeLists.txt b/gr-filter/python/CMakeLists.txt
index 65664dad1..b206b3ebc 100644
--- a/gr-filter/python/CMakeLists.txt
+++ b/gr-filter/python/CMakeLists.txt
@@ -44,7 +44,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-filter/python
         ${CMAKE_BINARY_DIR}/gr-filter/swig
     )
-    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-filter)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-filter)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gr-pager/python/CMakeLists.txt b/gr-pager/python/CMakeLists.txt
index 7afe81b03..9a0b6cca2 100644
--- a/gr-pager/python/CMakeLists.txt
+++ b/gr-pager/python/CMakeLists.txt
@@ -43,7 +43,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-pager/python
         ${CMAKE_BINARY_DIR}/gr-pager/swig
     )
-    set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-pager)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-pager)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gr-qtgui/python/CMakeLists.txt b/gr-qtgui/python/CMakeLists.txt
index e57338073..34a08fd10 100644
--- a/gr-qtgui/python/CMakeLists.txt
+++ b/gr-qtgui/python/CMakeLists.txt
@@ -40,7 +40,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-qtgui/python
         ${CMAKE_BINARY_DIR}/gr-qtgui/swig
     )
-    set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-qtgui)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-qtgui)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gr-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt
index d75a242c8..d8b3e4bcf 100644
--- a/gr-trellis/src/python/CMakeLists.txt
+++ b/gr-trellis/src/python/CMakeLists.txt
@@ -32,7 +32,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-digital/swig
         ${CMAKE_BINARY_DIR}/gr-trellis/src/lib
     )
-    set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-digital gnuradio-trellis)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-digital gnuradio-trellis)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
index 0a8c83168..65df9ef9e 100644
--- a/gr-video-sdl/src/CMakeLists.txt
+++ b/gr-video-sdl/src/CMakeLists.txt
@@ -108,7 +108,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
         ${CMAKE_BINARY_DIR}/gr-video-sdl/src
     )
-    set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-video-sdl)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-video-sdl)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING AND ENABLE_PYTHON)
diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/CMakeLists.txt
index ee3765d5e..a0d03889c 100644
--- a/gr-vocoder/python/CMakeLists.txt
+++ b/gr-vocoder/python/CMakeLists.txt
@@ -44,7 +44,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-vocoder/python
         ${CMAKE_BINARY_DIR}/gr-vocoder/swig
     )
-    set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-vocoder)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-vocoder)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
diff --git a/gr-wavelet/python/CMakeLists.txt b/gr-wavelet/python/CMakeLists.txt
index f11868395..10ac18d7f 100644
--- a/gr-wavelet/python/CMakeLists.txt
+++ b/gr-wavelet/python/CMakeLists.txt
@@ -41,7 +41,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-wavelet/python
         ${CMAKE_BINARY_DIR}/gr-wavelet/swig
     )
-    set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-wavelet)
+    list(APPEND GR_TEST_TARGET_DEPS gnuradio-wavelet)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)