t/gr-ieee802-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from osh/master

Browse Source 
cleaning up cmake linking against gnuradio-filter and gnuradio-fft
This commit is contained in:
Bastian Bloessl
2013-09-25 23:03:20 -07:00
parent 46702deeeb c5d12438cc
commit 915536786a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -1
View File
@@ -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)
lib/CMakeLists.txt
+3 -1
View File
@@ -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")
########################################################################