diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-14 10:07:45 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-14 10:07:45 -0800 |
| commit | 8e01e6f004fe9039cb833250231192438c982c0a (patch) | |
| tree | 0e16a1983a52ee4b06d4e17d1fcf617d954cce9d /gr-trellis | |
| parent | 01abe9f225dd73e6feae151e42c285dd3c880d54 (diff) | |
| parent | 315237fd3935f31a0920613af3947189520f796a (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/src/lib/CMakeLists.txt
gr-digital/python/CMakeLists.txt
gr-trellis/src/python/CMakeLists.txt
gr-vocoder/python/CMakeLists.txt
gr-wavelet/python/CMakeLists.txt
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/src/python/CMakeLists.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gr-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt index 5b5a35bcfc..b6167c905c 100644 --- a/gr-trellis/src/python/CMakeLists.txt +++ b/gr-trellis/src/python/CMakeLists.txt @@ -21,20 +21,19 @@ # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-analog/swig + ${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) + include(GrPython) include(GrTest) file(GLOB py_qa_test_files "qa_*.py") foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) - set(GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gnuradio-core/src/python - ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig - ${CMAKE_BINARY_DIR}/gr-digital/swig - ${CMAKE_BINARY_DIR}/gr-analog/swig - ${CMAKE_BINARY_DIR}/gr-trellis/src/lib - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core - gnuradio-digital gnuradio-analog 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) |