diff options
| author | Josh Blum | 2012-05-22 21:53:18 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-05-22 21:53:18 -0700 |
| commit | 4a34f4497035ef51ff99f3faadbb65b66ba27c9f (patch) | |
| tree | ad257b1e70d74d2c6eb3db76d2f0c2eec2913008 /gr-wavelet | |
| parent | 598a843ab4a0f792e81f163ce541f4160fd66537 (diff) | |
| download | gnuradio-4a34f4497035ef51ff99f3faadbb65b66ba27c9f.tar.gz gnuradio-4a34f4497035ef51ff99f3faadbb65b66ba27c9f.tar.bz2 gnuradio-4a34f4497035ef51ff99f3faadbb65b66ba27c9f.zip | |
wavelet: fixes for missing qa libraries and compile defines
Diffstat (limited to 'gr-wavelet')
| -rw-r--r-- | gr-wavelet/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-wavelet/python/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index f0d9068b7..d0c632800 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -35,6 +35,7 @@ link_directories(${Boost_LIBRARY_DIRS}) include_directories(${GSL_INCLUDE_DIRS}) link_directories(${GSL_LIBRARY_DIRS}) +add_definitions(${GSL_DEFINITIONS}) ######################################################################## # Setup library diff --git a/gr-wavelet/python/CMakeLists.txt b/gr-wavelet/python/CMakeLists.txt index 650299672..f11868395 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 gruel gnuradio-core gnuradio-wavelet) - GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file}) + set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core 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) |