Merge branch 'master' into next
# Conflicts: # CMakeLists.txt
This commit is contained in:
+10
-5
@@ -81,22 +81,27 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
|
||||
# Find gnuradio build dependencies
|
||||
########################################################################
|
||||
set(GR_REQUIRED_COMPONENTS RUNTIME FILTER FFT PMT DIGITAL)
|
||||
|
||||
find_package(Gnuradio)
|
||||
find_package(CppUnit)
|
||||
find_package(Log4cpp)
|
||||
|
||||
if(NOT GNURADIO_RUNTIME_FOUND)
|
||||
message(FATAL_ERROR "GnuRadio Runtime required to compile ieee802-11")
|
||||
message(FATAL_ERROR "GNU Radio required to compile gr-ieee802-11")
|
||||
endif()
|
||||
|
||||
find_package(CppUnit)
|
||||
if(NOT CPPUNIT_FOUND)
|
||||
message(FATAL_ERROR "CppUnit required to compile ieee802-11")
|
||||
message(FATAL_ERROR "CppUnit required to compile gr-ieee802-11")
|
||||
endif()
|
||||
|
||||
find_package(Log4cpp)
|
||||
if(NOT LOG4CPP_FOUND)
|
||||
message(FATAL_ERROR "LOG4CPP required to compile ieee802-11")
|
||||
endif ()
|
||||
|
||||
find_package(SWIG)
|
||||
if(NOT SWIG_FOUND)
|
||||
message(FATAL_ERROR "SWIG required to compile gr-ieee802-11")
|
||||
endif()
|
||||
|
||||
########################################################################
|
||||
# On Apple only, set install name and use rpath correctly, if not already set
|
||||
########################################################################
|
||||
|
||||
Reference in New Issue
Block a user