summaryrefslogtreecommitdiff
path: root/gr-wavelet
diff options
context:
space:
mode:
Diffstat (limited to 'gr-wavelet')
-rw-r--r--gr-wavelet/CMakeLists.txt1
-rw-r--r--gr-wavelet/lib/CMakeLists.txt2
-rw-r--r--gr-wavelet/python/CMakeLists.txt2
-rwxr-xr-xgr-wavelet/python/qa_classify.py3
-rw-r--r--gr-wavelet/swig/CMakeLists.txt1
5 files changed, 8 insertions, 1 deletions
diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt
index 8d7ac65f7b..1eb536f9d9 100644
--- a/gr-wavelet/CMakeLists.txt
+++ b/gr-wavelet/CMakeLists.txt
@@ -32,6 +32,7 @@ include(GrComponent)
GR_REGISTER_COMPONENT("gr-wavelet" ENABLE_GR_WAVELET
Boost_FOUND
ENABLE_GR_CORE
+ ENABLE_GR_BLOCKS
ENABLE_GR_ANALOG
GSL_FOUND
)
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
index e49a5433f3..92f1082660 100644
--- a/gr-wavelet/lib/CMakeLists.txt
+++ b/gr-wavelet/lib/CMakeLists.txt
@@ -24,6 +24,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${GR_WAVELET_INCLUDE_DIRS}
+ ${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_CORE_INCLUDE_DIRS}
${GRUEL_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
@@ -47,6 +48,7 @@ list(APPEND gr_wavelet_sources
list(APPEND wavelet_libs
gnuradio-core
+ gnuradio-blocks
${Boost_LIBRARIES}
${WAVELET_LIBRARIES}
${GSL_LIBRARIES}
diff --git a/gr-wavelet/python/CMakeLists.txt b/gr-wavelet/python/CMakeLists.txt
index 9234c62bdb..7f7fd99ecf 100644
--- a/gr-wavelet/python/CMakeLists.txt
+++ b/gr-wavelet/python/CMakeLists.txt
@@ -37,6 +37,8 @@ list(APPEND GR_TEST_PYTHON_DIRS
${CMAKE_BINARY_DIR}/gr-analog/swig
${CMAKE_BINARY_DIR}/gr-wavelet/python
${CMAKE_BINARY_DIR}/gr-wavelet/swig
+ ${CMAKE_BINARY_DIR}/gr-blocks/python
+ ${CMAKE_BINARY_DIR}/gr-blocks/swig
)
list(APPEND GR_TEST_TARGET_DEPS gnuradio-wavelet)
diff --git a/gr-wavelet/python/qa_classify.py b/gr-wavelet/python/qa_classify.py
index 0906761aca..c2972c92f2 100755
--- a/gr-wavelet/python/qa_classify.py
+++ b/gr-wavelet/python/qa_classify.py
@@ -27,6 +27,7 @@ import copy
import math
import wavelet_swig
import analog_swig as analog
+import blocks_swig as blocks
def sqr(x):
return x*x
@@ -88,7 +89,7 @@ class test_classify(gr_unittest.TestCase):
trg_data = copy.deepcopy(src_data)
src = gr.vector_source_f(src_data, False, len(src_data))
- st = gr.stretch_ff(-1.0/5.0, len(src_data))
+ st = blocks.stretch_ff(-1.0/5.0, len(src_data))
dst = gr.vector_sink_f(len(src_data))
self.tb.connect(src, st)
self.tb.connect(st, dst)
diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt
index ea7a24b244..0c78c8936f 100644
--- a/gr-wavelet/swig/CMakeLists.txt
+++ b/gr-wavelet/swig/CMakeLists.txt
@@ -25,6 +25,7 @@ include(GrSwig)
set(GR_SWIG_INCLUDE_DIRS
${GR_WAVELET_INCLUDE_DIRS}
+ ${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
${GRUEL_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}