git rid of itpp
This commit is contained in:
@@ -83,7 +83,6 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
|
||||
set(GR_REQUIRED_COMPONENTS RUNTIME FILTER FFT PMT DIGITAL)
|
||||
find_package(Gnuradio)
|
||||
find_package(CppUnit)
|
||||
find_package(ITPP)
|
||||
find_package(Log4cpp)
|
||||
|
||||
if(NOT GNURADIO_RUNTIME_FOUND)
|
||||
@@ -94,10 +93,6 @@ if(NOT CPPUNIT_FOUND)
|
||||
message(FATAL_ERROR "CppUnit required to compile ieee802-11")
|
||||
endif()
|
||||
|
||||
if(NOT ITPP_FOUND)
|
||||
message(FATAL_ERROR "ITPP required to compile ieee802-11")
|
||||
endif()
|
||||
|
||||
if (LOG4CPP_FOUND)
|
||||
message(STATUS "Found LOG4CPP: ${LOG4CPP_LIBRARIES}")
|
||||
add_definitions("-DGR_IEEE80211_LOG4CPP")
|
||||
@@ -134,7 +129,6 @@ include_directories(
|
||||
${CMAKE_BINARY_DIR}/include
|
||||
${Boost_INCLUDE_DIRS}
|
||||
${CPPUNIT_INCLUDE_DIRS}
|
||||
${ITPP_INCLUDE_DIR}
|
||||
${GNURADIO_RUNTIME_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
||||
@@ -29,14 +29,6 @@ There are several ways to install GNU Radio. You can use
|
||||
- [from source](http://gnuradio.org/redmine/projects/gnuradio/wiki/InstallingGRFromSource)
|
||||
|
||||
|
||||
### IT++
|
||||
|
||||
I use the Viterbi decoder of IT++.
|
||||
|
||||
sudo apt-get install libitpp-dev
|
||||
sudo port install itpp
|
||||
|
||||
|
||||
### gr-foo
|
||||
|
||||
I have some non project specific GNU Radio blocks in my gr-foo repo that are needed. For example the Wireshark connector. You can find these blocks at [https://github.com/bastibl/gr-foo](https://github.com/bastibl/gr-foo). They are installed with the typical command sequence:
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
# - Find ITPP
|
||||
# Find the native ITPP includes and library
|
||||
# This module defines
|
||||
# ITPP_INCLUDE_DIR, where to find itpp/itbase.h, etc.
|
||||
# ITPP_LIBRARIES, the libraries needed to use ITPP.
|
||||
# ITPP_FOUND, If false, do not try to use ITPP.
|
||||
# also defined, but not for general use are
|
||||
# ITPP_LIBRARY, where to find the ITPP library.
|
||||
|
||||
include(FindPkgConfig)
|
||||
pkg_check_modules(PC_ITPP itpp)
|
||||
|
||||
find_path(ITPP_INCLUDE_DIR
|
||||
NAMES itpp/itbase.h
|
||||
HINTS ${PC_ITPP_INCLUDEDIR}
|
||||
${PC_ITPP_INCLUDEDIR}/include
|
||||
${ITPP_DIR}/include
|
||||
PATHS
|
||||
/usr/pkgs64/include
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
)
|
||||
find_library(ITPP_LIBRARY_NORMAL
|
||||
NAMES itpp
|
||||
HINTS ${PC_ITPP_LIBDIR}
|
||||
PATHS ${ITPP_DIR}/libs
|
||||
"${ITPP_DIR}\\win32\\lib"
|
||||
/usr/pkgs64/lib
|
||||
/usr/lib64
|
||||
/usr/lib
|
||||
/usr/local/lib
|
||||
)
|
||||
find_library(ITPP_LIBRARY_DEBUG
|
||||
NAMES itpp_debug
|
||||
HINTS ${PC_ITPP_LIBDIR}
|
||||
PATHS ${ITPP_DIR}/libs
|
||||
"${ITPP_DIR}\\win32\\lib"
|
||||
/usr/pkgs64/lib
|
||||
/usr/lib64
|
||||
/usr/lib
|
||||
/usr/local/lib
|
||||
)
|
||||
|
||||
if (ITPP_LIBRARY_NORMAL OR ITPP_LIBRARY_DEBUG)
|
||||
if ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND ITPP_LIBRARY_DEBUG)
|
||||
SET (ITPP_LIBRARY ${ITPP_LIBRARY_DEBUG})
|
||||
else ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND ITPP_LIBRARY_DEBUG)
|
||||
SET (ITPP_LIBRARY ${ITPP_LIBRARY_NORMAL})
|
||||
endif ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND ITPP_LIBRARY_DEBUG)
|
||||
endif (ITPP_LIBRARY_NORMAL OR ITPP_LIBRARY_DEBUG)
|
||||
|
||||
if (ITPP_LIBRARY AND ITPP_INCLUDE_DIR)
|
||||
SET(ITPP_LIBRARIES ${ITPP_LIBRARY})
|
||||
SET(ITPP_FOUND "YES")
|
||||
else (ITPP_LIBRARY AND ITPP_INCLUDE_DIR)
|
||||
SET(ITPP_FOUND "NO")
|
||||
endif (ITPP_LIBRARY AND ITPP_INCLUDE_DIR)
|
||||
|
||||
if (ITPP_FOUND)
|
||||
if (NOT ITPP_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found ITPP: ${ITPP_LIBRARIES}")
|
||||
endif (NOT ITPP_FIND_QUIETLY)
|
||||
else (ITPP_FOUND)
|
||||
if (ITPP_FIND_REQUIRED)
|
||||
MESSAGE(FATAL_ERROR "Could not find ITPP library")
|
||||
endif (ITPP_FIND_REQUIRED)
|
||||
endif (ITPP_FOUND)
|
||||
|
||||
mark_as_advanced(
|
||||
ITPP_LIBRARY
|
||||
ITPP_INCLUDE_DIR
|
||||
)
|
||||
@@ -117,7 +117,6 @@ list(APPEND gr_ieee802_11_sources
|
||||
list(APPEND gr_ieee802_11_libs
|
||||
${Boost_LIBRARIES}
|
||||
${GNURADIO_ALL_LIBRARIES}
|
||||
${ITPP_LIBRARIES}
|
||||
${LOG4CPP_LIBRARIES}
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user