diff options
28 files changed, 193 insertions, 133 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3582df93f..9af8d7eb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,6 +220,14 @@ install( COMPONENT "docs" ) +######################################################################## +# The following dependency libraries are needed by all gr modules: +######################################################################## +list(APPEND GR_TEST_TARGET_DEPS volk gruel gnuradio-core) +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gnuradio-core/src/python + ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig +) ######################################################################## # Add subdirectories (in order of deps) diff --git a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt index 3e75ead03..6a0555021 100644 --- a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt +++ b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt @@ -42,11 +42,6 @@ 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 - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core) 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/gnuradio-core/src/tests/CMakeLists.txt b/gnuradio-core/src/tests/CMakeLists.txt index 3c7f632b3..680141e7b 100644 --- a/gnuradio-core/src/tests/CMakeLists.txt +++ b/gnuradio-core/src/tests/CMakeLists.txt @@ -63,7 +63,7 @@ endforeach(test_not_run_src) # Set the test environment so the build libs will be found under MSVC. ######################################################################## include(GrTest) -set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core test-gnuradio-core) +list(APPEND GR_TEST_TARGET_DEPS test-gnuradio-core) add_executable(gr_core_test_all test_all.cc) target_link_libraries(gr_core_test_all test-gnuradio-core) GR_ADD_TEST(gr-core-test-all gr_core_test_all) diff --git a/gr-analog/grc/analog_block_tree.xml b/gr-analog/grc/analog_block_tree.xml index 99255d759..b5b2ecd56 100644 --- a/gr-analog/grc/analog_block_tree.xml +++ b/gr-analog/grc/analog_block_tree.xml @@ -57,4 +57,8 @@ <block>analog_pll_freqdet_cf</block> <block>analog_pll_refout_cc</block> </cat> + <cat> + <name>Probes</name> + <block>analog_probe_avg_mag_sqrd_x</block> + </cat> </cat> diff --git a/gr-analog/grc/analog_probe_avg_mag_sqrd_x.xml b/gr-analog/grc/analog_probe_avg_mag_sqrd_x.xml new file mode 100644 index 000000000..b05ac6d0d --- /dev/null +++ b/gr-analog/grc/analog_probe_avg_mag_sqrd_x.xml @@ -0,0 +1,50 @@ +<?xml version="1.0"?> +<!-- +################################################### +##Probe Average Magnitude Squared +################################################### + --> +<block> + <name>Probe Avg Mag^2</name> + <key>analog_probe_avg_mag_sqrd_x</key> + <import>from gnuradio import analog</import> + <make>analog.probe_avg_mag_sqrd_$(type)($threshold, $alpha)</make> + <callback>set_alpha($alpha)</callback> + <callback>set_threshold($threshold)</callback> + <param> + <name>Type</name> + <key>type</key> + <type>enum</type> + <option> + <name>Complex</name> + <key>c</key> + <opt>input:complex</opt> + </option> + <option> + <name>Float</name> + <key>f</key> + <opt>input:float</opt> + </option> + </param> + <param> + <name>Threshold (dB)</name> + <key>threshold</key> + <value>0</value> + <type>real</type> + </param> + <param> + <name>Alpha</name> + <key>alpha</key> + <value>1</value> + <type>real</type> + </param> + <sink> + <name>in</name> + <type>$type.input</type> + </sink> + <doc> +Available functions to probe: level() + +Use with the function probe block. + </doc> +</block> diff --git a/gr-analog/include/analog/frequency_modulator_fc.h b/gr-analog/include/analog/frequency_modulator_fc.h index b163bac94..8706d513a 100644 --- a/gr-analog/include/analog/frequency_modulator_fc.h +++ b/gr-analog/include/analog/frequency_modulator_fc.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_ANALOOG_FREQUENCY_MODULATOR_FC_H -#define INCLUDED_ANALOOG_FREQUENCY_MODULATOR_FC_H +#ifndef INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H +#define INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H #include <analog/api.h> #include <gr_sync_block.h> diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt index aaf3c8656..653d5be27 100644 --- a/gr-analog/lib/CMakeLists.txt +++ b/gr-analog/lib/CMakeLists.txt @@ -173,6 +173,8 @@ if(ENABLE_TESTING) ${CPPUNIT_LIBRARIES} ) + list(APPEND GR_TEST_TARGET_DEPS gnuradio-analog gnuradio-filter gnuradio-fft) + GR_ADD_TEST(test_gr_analog test-gr-analog) endif(ENABLE_TESTING) diff --git a/gr-analog/python/CMakeLists.txt b/gr-analog/python/CMakeLists.txt index 08570eea3..1657e5bf3 100644 --- a/gr-analog/python/CMakeLists.txt +++ b/gr-analog/python/CMakeLists.txt @@ -33,19 +33,19 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-analog/python + ${CMAKE_BINARY_DIR}/gr-analog/swig + ${CMAKE_BINARY_DIR}/gr-filter/python + ${CMAKE_BINARY_DIR}/gr-filter/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-analog gnuradio-filter gnuradio-fft) + 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-analog/python - ${CMAKE_BINARY_DIR}/gr-analog/swig - ${CMAKE_BINARY_DIR}/gr-filter/python - ${CMAKE_BINARY_DIR}/gr-filter/swig - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-analog) 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-atsc/src/lib/CMakeLists.txt b/gr-atsc/src/lib/CMakeLists.txt index 39dbefa60..8c67d9028 100644 --- a/gr-atsc/src/lib/CMakeLists.txt +++ b/gr-atsc/src/lib/CMakeLists.txt @@ -129,7 +129,7 @@ list(APPEND test_atsci_sources ) include(GrTest) -set(GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-core gruel volk) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc) add_executable(test_atsci ${test_atsci_sources} test_atsci.cc) target_link_libraries(test_atsci gnuradio-atsc gnuradio-core ${CPPUNIT_LIBRARIES}) GR_ADD_TEST(atsci-test test_atsci) diff --git a/gr-atsc/src/python/CMakeLists.txt b/gr-atsc/src/python/CMakeLists.txt index d38d6d803..fa9f91156 100644 --- a/gr-atsc/src/python/CMakeLists.txt +++ b/gr-atsc/src/python/CMakeLists.txt @@ -43,16 +43,16 @@ install( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-atsc/src/lib +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc) + 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-atsc/src/lib - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-atsc) 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-blocks/python/CMakeLists.txt b/gr-blocks/python/CMakeLists.txt index 5044e2320..710ab155c 100644 --- a/gr-blocks/python/CMakeLists.txt +++ b/gr-blocks/python/CMakeLists.txt @@ -31,17 +31,17 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-blocks/python + ${CMAKE_BINARY_DIR}/gr-blocks/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-blocks) + 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-blocks/python - ${CMAKE_BINARY_DIR}/gr-blocks/swig - ) - set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-blocks) 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-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt index 8c4834115..91bbf9212 100644 --- a/gr-comedi/src/CMakeLists.txt +++ b/gr-comedi/src/CMakeLists.txt @@ -100,16 +100,16 @@ endif(ENABLE_PYTHON) # Handle the unit tests ######################################################################## if(ENABLE_TESTING AND ENABLE_PYTHON) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-comedi/src +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-comedi) + 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-comedi/src - ) - set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-comedi) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING AND ENABLE_PYTHON) diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt index 6a9f10295..8f2af0664 100644 --- a/gr-digital/python/CMakeLists.txt +++ b/gr-digital/python/CMakeLists.txt @@ -62,17 +62,17 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-digital/python + ${CMAKE_BINARY_DIR}/gr-digital/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-digital gnuradio-filter gnuradio-fft) + 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/python - ${CMAKE_BINARY_DIR}/gr-digital/swig - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-digital) 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-fcd/python/CMakeLists.txt b/gr-fcd/python/CMakeLists.txt index 9e59e643f..39ec5efe9 100644 --- a/gr-fcd/python/CMakeLists.txt +++ b/gr-fcd/python/CMakeLists.txt @@ -31,17 +31,17 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-fcd/python + ${CMAKE_BINARY_DIR}/gr-fcd/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-audio gnuradio-fcd) + 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-fcd/python - ${CMAKE_BINARY_DIR}/gr-fcd/swig - ) - set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-audio gnuradio-fcd) 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-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt index ea1248fba..c16e0d116 100644 --- a/gr-fft/lib/CMakeLists.txt +++ b/gr-fft/lib/CMakeLists.txt @@ -29,7 +29,6 @@ include_directories( ${FFTW3F_INCLUDE_DIRS} ) -link_directories(${FFT_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) link_directories(${FFTW3F_LIBRARY_DIRS}) @@ -47,10 +46,14 @@ list(APPEND fft_sources list(APPEND fft_libs gnuradio-core ${Boost_LIBRARIES} - ${FFT_LIBRARIES} ${FFTW3F_LIBRARIES} ) +if(FFTW3F_THREADS_LIBRARIES) + list(APPEND fft_libs ${FFTW3F_THREADS_LIBRARIES}) + add_definitions("-DFFTW3F_THREADS") +endif() + add_library(gnuradio-fft SHARED ${fft_sources}) target_link_libraries(gnuradio-fft ${fft_libs}) GR_LIBRARY_FOO(gnuradio-fft RUNTIME_COMPONENT "fft_runtime" DEVEL_COMPONENT "fft_devel") diff --git a/gr-fft/lib/fft_vfc_fftw.cc b/gr-fft/lib/fft_vfc_fftw.cc index 8f9b127e5..890dac7be 100644 --- a/gr-fft/lib/fft_vfc_fftw.cc +++ b/gr-fft/lib/fft_vfc_fftw.cc @@ -45,7 +45,7 @@ namespace gr { const std::vector<float> &window, int nthreads) : gr_sync_block("fft_vfc_fftw", - gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex)), + gr_make_io_signature(1, 1, fft_size * sizeof(float)), gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex))), d_fft_size(fft_size), d_forward(forward) { diff --git a/gr-fft/python/CMakeLists.txt b/gr-fft/python/CMakeLists.txt index c64df4659..3b328780f 100644 --- a/gr-fft/python/CMakeLists.txt +++ b/gr-fft/python/CMakeLists.txt @@ -31,17 +31,17 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-fft/python + ${CMAKE_BINARY_DIR}/gr-fft/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-fft) + 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-fft/python - ${CMAKE_BINARY_DIR}/gr-fft/swig - ) - set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-fft) 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-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt index 532bd1992..81f62aa54 100644 --- a/gr-filter/lib/CMakeLists.txt +++ b/gr-filter/lib/CMakeLists.txt @@ -97,12 +97,9 @@ include_directories( ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_FFT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - ${FFTW3F_INCLUDE_DIRS} ) -link_directories(${FFT_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) -link_directories(${FFTW3F_LIBRARY_DIRS}) ######################################################################## # Setup library @@ -144,7 +141,6 @@ list(APPEND filter_libs gnuradio-fft volk ${Boost_LIBRARIES} - ${FFTW3F_LIBRARIES} ) add_library(gnuradio-filter SHARED ${filter_sources}) @@ -173,10 +169,12 @@ if(ENABLE_TESTING) add_executable(test-gr-filter ${test_gr_filter_sources}) + list(APPEND GR_TEST_TARGET_DEPS test-gr-filter gnuradio-filter gnuradio-fft) + target_link_libraries( test-gr-filter gnuradio-core - gnuradio-filter + gnuradio-filter ${Boost_LIBRARIES} ${CPPUNIT_LIBRARIES} ) diff --git a/gr-filter/lib/fir_filter.cc b/gr-filter/lib/fir_filter.cc index 6137dd269..d7a0a0c70 100644 --- a/gr-filter/lib/fir_filter.cc +++ b/gr-filter/lib/fir_filter.cc @@ -50,7 +50,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -66,7 +66,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -155,7 +155,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -171,7 +171,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -262,7 +262,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -278,7 +278,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -368,7 +368,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -384,7 +384,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -473,7 +473,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -489,7 +489,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -579,7 +579,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -595,7 +595,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc index 7bff8d4a7..181630d48 100644 --- a/gr-filter/lib/fir_filter_with_buffer.cc +++ b/gr-filter/lib/fir_filter_with_buffer.cc @@ -60,7 +60,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -81,7 +81,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -213,7 +213,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -234,7 +234,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -366,7 +366,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } @@ -387,7 +387,7 @@ namespace gr { for(int i = 0; i < d_naligned; i++) { fft::free(d_aligned_taps[i]); } - fft::free(d_aligned_taps); + ::free(d_aligned_taps); d_aligned_taps = NULL; } diff --git a/gr-filter/python/CMakeLists.txt b/gr-filter/python/CMakeLists.txt index 65664dad1..bcb55cf46 100644 --- a/gr-filter/python/CMakeLists.txt +++ b/gr-filter/python/CMakeLists.txt @@ -34,17 +34,17 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-filter/python + ${CMAKE_BINARY_DIR}/gr-filter/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-filter gnuradio-fft) + 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-filter/python - ${CMAKE_BINARY_DIR}/gr-filter/swig - ) - set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-filter) 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-pager/python/CMakeLists.txt b/gr-pager/python/CMakeLists.txt index 7afe81b03..30ac0364d 100644 --- a/gr-pager/python/CMakeLists.txt +++ b/gr-pager/python/CMakeLists.txt @@ -33,17 +33,17 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-pager/python + ${CMAKE_BINARY_DIR}/gr-pager/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-pager) + 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-pager/python - ${CMAKE_BINARY_DIR}/gr-pager/swig - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-pager) 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-qtgui/python/CMakeLists.txt b/gr-qtgui/python/CMakeLists.txt index e57338073..582285808 100644 --- a/gr-qtgui/python/CMakeLists.txt +++ b/gr-qtgui/python/CMakeLists.txt @@ -30,17 +30,17 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-qtgui/python + ${CMAKE_BINARY_DIR}/gr-qtgui/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-qtgui) + 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-qtgui/python - ${CMAKE_BINARY_DIR}/gr-qtgui/swig - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-qtgui) 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-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt index d75a242c8..f8e4d9532 100644 --- a/gr-trellis/src/python/CMakeLists.txt +++ b/gr-trellis/src/python/CMakeLists.txt @@ -21,18 +21,18 @@ # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-digital/swig + ${CMAKE_BINARY_DIR}/gr-trellis/src/lib +) +list(APPEND GR_TEST_TARGET_DEPS 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-trellis/src/lib - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-digital 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) diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt index 795b46567..6d99af350 100644 --- a/gr-uhd/swig/CMakeLists.txt +++ b/gr-uhd/swig/CMakeLists.txt @@ -28,8 +28,8 @@ set(GR_SWIG_FLAGS -DGR_HAVE_UHD) #needed to parse uhd_swig.i set(GR_SWIG_TARGET_DEPS core_swig) set(GR_SWIG_INCLUDE_DIRS - ${GR_UHD_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GR_UHD_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/uhd_swig_doc.i) diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt index 0a8c83168..14fdb3802 100644 --- a/gr-video-sdl/src/CMakeLists.txt +++ b/gr-video-sdl/src/CMakeLists.txt @@ -99,16 +99,16 @@ endif(ENABLE_PYTHON) # Handle the unit tests ######################################################################## if(ENABLE_TESTING AND ENABLE_PYTHON) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-video-sdl/src +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-video-sdl) + 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-video-sdl/src - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-video-sdl) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING AND ENABLE_PYTHON) diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/CMakeLists.txt index ee3765d5e..9152ee133 100644 --- a/gr-vocoder/python/CMakeLists.txt +++ b/gr-vocoder/python/CMakeLists.txt @@ -34,17 +34,17 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-vocoder/python + ${CMAKE_BINARY_DIR}/gr-vocoder/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-vocoder) + 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-vocoder/python - ${CMAKE_BINARY_DIR}/gr-vocoder/swig - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-vocoder) 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/python/CMakeLists.txt b/gr-wavelet/python/CMakeLists.txt index f11868395..7f4d3a7af 100644 --- a/gr-wavelet/python/CMakeLists.txt +++ b/gr-wavelet/python/CMakeLists.txt @@ -31,17 +31,17 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-wavelet/python + ${CMAKE_BINARY_DIR}/gr-wavelet/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-wavelet) + 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-wavelet/python - ${CMAKE_BINARY_DIR}/gr-wavelet/swig - ) - 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) |