Merge branch 'maint'

4 files changed, 28 insertions, 30 deletions

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)