diff options
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | gr-digital/python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-filter/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-filter/python/CMakeLists.txt | 2 |
4 files changed, 13 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4185b090b..a33ecc60d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,6 +220,14 @@ install( COMPONENT "docs" ) +######################################################################## +# The following dependency libraries are needed by all gr modules: +######################################################################## +list(APPEND GR_TEST_TARGET_DEPS volk gruel gnuradio-core) +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gnuradio-core/src/python + ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig +) ######################################################################## # Add subdirectories (in order of deps) @@ -229,13 +237,6 @@ 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) -list(APPEND GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gnuradio-core/src/python - ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig -) - add_subdirectory(gr-fft) add_subdirectory(gr-filter) add_subdirectory(gr-atsc) diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt index 6c69757cf..8f2af0664 100644 --- a/gr-digital/python/CMakeLists.txt +++ b/gr-digital/python/CMakeLists.txt @@ -67,7 +67,7 @@ list(APPEND GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/gr-digital/python ${CMAKE_BINARY_DIR}/gr-digital/swig ) -list(APPEND GR_TEST_TARGET_DEPS gnuradio-digital gnuradio-filter) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-digital gnuradio-filter gnuradio-fft) include(GrTest) file(GLOB py_qa_test_files "qa_*.py") diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt index 532bd1992..b0bae6774 100644 --- a/gr-filter/lib/CMakeLists.txt +++ b/gr-filter/lib/CMakeLists.txt @@ -173,10 +173,12 @@ if(ENABLE_TESTING) add_executable(test-gr-filter ${test_gr_filter_sources}) + list(APPEND GR_TEST_TARGET_DEPS test-gr-filter gnuradio-filter gnuradio-fft) + target_link_libraries( test-gr-filter gnuradio-core - gnuradio-filter + gnuradio-filter ${Boost_LIBRARIES} ${CPPUNIT_LIBRARIES} ) diff --git a/gr-filter/python/CMakeLists.txt b/gr-filter/python/CMakeLists.txt index 13433baac..bcb55cf46 100644 --- a/gr-filter/python/CMakeLists.txt +++ b/gr-filter/python/CMakeLists.txt @@ -39,7 +39,7 @@ list(APPEND GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/gr-filter/python ${CMAKE_BINARY_DIR}/gr-filter/swig ) -list(APPEND GR_TEST_TARGET_DEPS gnuradio-filter) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-filter gnuradio-fft) include(GrTest) file(GLOB py_qa_test_files "qa_*.py") |