From 37f752257d7fc336de1fe85a5a83134e66441e6e Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 13 Nov 2012 17:04:16 -0800
Subject: gr: set a common GR_TEST_TARGET_DEPS for all module unit tests

Each unit test shares common dependencies,
but we have been neglecting to set these.

In this changeset, we set one top level GR_TEST_TARGET_DEPS,
and simply append module-specific dependencies for each test.

This also helps to fix QA tests on windows
which were missing the dependencies list.

Conflicts:

	gr-analog/python/CMakeLists.txt
	gr-blocks/python/CMakeLists.txt
---
 gr-fft/python/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-fft')

diff --git a/gr-fft/python/CMakeLists.txt b/gr-fft/python/CMakeLists.txt
index c64df4659..1e354d7a2 100644
--- a/gr-fft/python/CMakeLists.txt
+++ b/gr-fft/python/CMakeLists.txt
@@ -41,7 +41,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-fft/python
         ${CMAKE_BINARY_DIR}/gr-fft/swig
     )
-    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-fft)
+    list(APPEND GR_TEST_TARGET_DEPS 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)
-- 
cgit 


From c4c0ce97f4f5586548a603acc8c9721f416c5803 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 13 Nov 2012 17:31:45 -0800
Subject: gr: same change for common PYTHON test paths

Conflicts:

	gr-analog/python/CMakeLists.txt
	gr-blocks/python/CMakeLists.txt
---
 gr-fft/python/CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'gr-fft')

diff --git a/gr-fft/python/CMakeLists.txt b/gr-fft/python/CMakeLists.txt
index 1e354d7a2..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
-    )
-    list(APPEND GR_TEST_TARGET_DEPS 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)
-- 
cgit 


From 83ba8a2dd64c821458e9d7ab89c89a08ef8bc31d Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 13 Nov 2012 18:07:46 -0800
Subject: fft: removed non-existant FFT_LIBRARY_DIRS FFT_LIBRARIES

---
 gr-fft/lib/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gr-fft')

diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt
index ea1248fba..6ca20363b 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,7 +46,6 @@ list(APPEND fft_sources
 list(APPEND fft_libs
     gnuradio-core
     ${Boost_LIBRARIES}
-    ${FFT_LIBRARIES}
     ${FFTW3F_LIBRARIES}
 )
 
-- 
cgit 


From 02ac01a814a9f856ed1f9a65f6b7fe281cdb13f1 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 13 Nov 2012 18:12:37 -0800
Subject: fft: restore FFTW3F_THREADS support for fft.cc

---
 gr-fft/lib/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gr-fft')

diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt
index 6ca20363b..c16e0d116 100644
--- a/gr-fft/lib/CMakeLists.txt
+++ b/gr-fft/lib/CMakeLists.txt
@@ -49,6 +49,11 @@ list(APPEND fft_libs
     ${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")
-- 
cgit