diff options
Diffstat (limited to 'gr-wavelet')
| -rw-r--r-- | gr-wavelet/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-wavelet/python/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-wavelet/swig/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index 3247c17b5..9594f6a6a 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -32,6 +32,7 @@ include_directories( link_directories(${WAVELET_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_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) diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt index 82d083dea..2c5f433eb 100644 --- a/gr-wavelet/swig/CMakeLists.txt +++ b/gr-wavelet/swig/CMakeLists.txt @@ -30,7 +30,7 @@ set(GR_SWIG_INCLUDE_DIRS ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/wavelet_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/wavelet) set(GR_SWIG_LIBRARIES gnuradio-wavelet ${GSL_LDFLAGS}) |