From c5d12438cc23f85b15893ad174183bc4f2d2cc10 Mon Sep 17 00:00:00 2001
From: Tim O'Shea <tim.oshea753@gmail.com>
Date: Wed, 25 Sep 2013 18:58:25 -0400
Subject: [PATCH] cleaning up cmake linking against gnuradio-filter and
 gnuradio-fft

---
 CMakeLists.txt     | 3 ++-
 lib/CMakeLists.txt | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f97f211..e57367a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,8 @@ set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
 ########################################################################
 # Find gnuradio build dependencies
 ########################################################################
-find_package(GnuradioRuntime)
+set(GR_REQUIRED_COMPONENTS RUNTIME FILTER FFT)
+find_package(Gnuradio)
 find_package(CppUnit)
 
 if(NOT GNURADIO_RUNTIME_FOUND)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index d909db1..b7374eb 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -34,10 +34,12 @@ list(APPEND gr_ieee802_11_sources
 list(APPEND gr_ieee802_11_libs
     ${Boost_LIBRARIES}
     ${GNURADIO_RUNTIME_LIBRARIES}
+    ${GNURADIO_FFT_LIBRARIES} 
+    ${GNURADIO_FILTER_LIBRARIES}
 )
 
 add_library(gnuradio-ieee802_11 SHARED ${gr_ieee802_11_sources})
-target_link_libraries(gnuradio-ieee802_11 ${gr_ieee802_11_libs} itpp gnuradio-fft gnuradio-filter)
+target_link_libraries(gnuradio-ieee802_11 ${gr_ieee802_11_libs} itpp)
 set_target_properties(gnuradio-ieee802_11 PROPERTIES DEFINE_SYMBOL "gnuradio_ieee802_11_EXPORTS")
 
 ########################################################################