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/lib')

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/lib')

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