Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix for Volk requirements with another method
  • Loading branch information
vamsi765 committed Apr 30, 2017
1 parent 17dd8d0 commit 8085a37
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion CMakeLists.txt
Expand Up @@ -134,12 +134,13 @@ endif(APPLE)
########################################################################
find_package(CppUnit)
find_package(Doxygen)
find_package(Volk)

# Search for GNU Radio and its components and versions. Add any
# components required to the list of GR_REQUIRED_COMPONENTS (in all
# caps such as FILTER or FFT) and change the version to the minimum
# API compatible version required.
set(GR_REQUIRED_COMPONENTS RUNTIME VOLK)
set(GR_REQUIRED_COMPONENTS RUNTIME)
find_package(Gnuradio "3.7.2" REQUIRED)
list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
include(GrVersion)
Expand All @@ -157,6 +158,9 @@ else(DOXYGEN_FOUND)
option(ENABLE_DOXYGEN "Build docs using Doxygen" OFF)
endif(DOXYGEN_FOUND)

if(NOT VOLK_FOUND)
message(FATAL_ERROR "Volk required to compile ieee802_15_4")
endif()
########################################################################
# Setup the include and linker paths
########################################################################
Expand All @@ -167,12 +171,14 @@ include_directories(
${CMAKE_BINARY_DIR}/include
${Boost_INCLUDE_DIRS}
${CPPUNIT_INCLUDE_DIRS}
${VOLK_INCLUDE_DIRS}
${GNURADIO_ALL_INCLUDE_DIRS}
)

link_directories(
${Boost_LIBRARY_DIRS}
${CPPUNIT_LIBRARY_DIRS}
${VOLK_LIBRARY_DIRS}
${GNURADIO_RUNTIME_LIBRARY_DIRS}
)

Expand Down
2 changes: 1 addition & 1 deletion lib/CMakeLists.txt
Expand Up @@ -36,7 +36,7 @@ if(NOT testinggnuradio_sources)
endif(NOT testinggnuradio_sources)

add_library(gnuradio-testinggnuradio SHARED ${testinggnuradio_sources})
target_link_libraries(gnuradio-testinggnuradio ${Boost_LIBRARIES} ${GNURADIO_ALL_LIBRARIES})
target_link_libraries(gnuradio-testinggnuradio ${Boost_LIBRARIES} ${VOLK_LIBRARIES} ${GNURADIO_ALL_LIBRARIES})
set_target_properties(gnuradio-testinggnuradio PROPERTIES DEFINE_SYMBOL "gnuradio_testinggnuradio_EXPORTS")

if(APPLE)
Expand Down

0 comments on commit 8085a37

Please sign in to comment.