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

updating code to work with gnuradio pre-release 3.7

Browse Source
This commit is contained in:
Tim O'Shea
2013-05-31 10:47:08 -04:00
parent 52da132955
commit b4fb46f3cc
16 changed files with 85 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+6 -10
View File
@@ -82,15 +82,11 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
########################################################################
# Find gnuradio build dependencies
########################################################################
find_package(Gruel)
find_package(GnuradioCore)
set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS PMT FILTER FFT)
find_package(Gnuradio)
if(NOT GRUEL_FOUND)
message(FATAL_ERROR "Gruel required to compile IEEE802-15-4")
endif()
if(NOT GNURADIO_CORE_FOUND)
message(FATAL_ERROR "GnuRadio Core required to compile IEEE802-15-4")
if(NOT GNURADIO_RUNTIME_FOUND)
message(FATAL_ERROR "GnuRadio Runtime required to compile IEEE802-15-4")
endif()
########################################################################
@@ -101,13 +97,13 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/lib
${Boost_INCLUDE_DIRS}
${GRUEL_INCLUDE_DIRS}
${GNURADIO_CORE_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
)
link_directories(
${Boost_LIBRARY_DIRS}
${GRUEL_LIBRARY_DIRS}
${GNURADIO_CORE_LIBRARY_DIRS}
${GNURADIO_RUNTIME_LIBRARY_DIRS}
)
set(GR_IEEE802_11_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)