summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan <jcorgan@corganenterprises.com>2012-05-26 10:20:23 -0700
committerJohnathan Corgan <jcorgan@corganenterprises.com>2012-05-26 10:20:23 -0700
commitfa70d653cd6603986c5cd723181b6162f5bd1325 (patch)
treebf812a5a14417a1e516db5ab3a97c9fedf926025
parentfb4a097d05f008c1aacba997b59d026dfa7b001b (diff)
parent4a34f4497035ef51ff99f3faadbb65b66ba27c9f (diff)
Merge branch 'master' into next
-rw-r--r--gr-wavelet/lib/CMakeLists.txt1
-rw-r--r--gr-wavelet/python/CMakeLists.txt4
2 files changed, 3 insertions, 2 deletions
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
index 76da7e5347..b2a5249146 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 650299672e..f118683954 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)