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

Merge branch 'master' into next

Browse Source 
# Conflicts:
#	CMakeLists.txt
This commit is contained in:
Bastian Bloessl
2017-03-17 15:16:32 +01:00
parent 7b119ba59e 951d8fd547
commit d1667da2d4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+10 -5
View File
@@ -81,22 +81,27 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
# Find gnuradio build dependencies # Find gnuradio build dependencies
######################################################################## ########################################################################
set(GR_REQUIRED_COMPONENTS RUNTIME FILTER FFT PMT DIGITAL) set(GR_REQUIRED_COMPONENTS RUNTIME FILTER FFT PMT DIGITAL)
find_package(Gnuradio) find_package(Gnuradio)
find_package(CppUnit)
find_package(Log4cpp)
if(NOT GNURADIO_RUNTIME_FOUND) 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() endif()
find_package(CppUnit)
if(NOT CPPUNIT_FOUND) if(NOT CPPUNIT_FOUND)
message(FATAL_ERROR "CppUnit required to compile ieee802-11") message(FATAL_ERROR "CppUnit required to compile gr-ieee802-11")
endif() endif()
find_package(Log4cpp)
if(NOT LOG4CPP_FOUND) if(NOT LOG4CPP_FOUND)
message(FATAL_ERROR "LOG4CPP required to compile ieee802-11") message(FATAL_ERROR "LOG4CPP required to compile ieee802-11")
endif () 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 # On Apple only, set install name and use rpath correctly, if not already set
######################################################################## ########################################################################