diff options
| author | Josh Blum | 2012-11-13 17:04:16 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-11-14 09:21:33 -0800 |
| commit | 37f752257d7fc336de1fe85a5a83134e66441e6e (patch) | |
| tree | ce160eb539c6ad81e274dfc9cfc76f0d2a085399 /gnuradio-core | |
| parent | 291513738c41128bd2ed37b26c53eb7273903dab (diff) | |
| download | gnuradio-37f752257d7fc336de1fe85a5a83134e66441e6e.tar.gz gnuradio-37f752257d7fc336de1fe85a5a83134e66441e6e.tar.bz2 gnuradio-37f752257d7fc336de1fe85a5a83134e66441e6e.zip | |
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
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/tests/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
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) |