diff options
| author | A. Maitland Bottoms <bottoms@debian.org> | 2015-12-07 11:53:35 -0500 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-12-11 12:00:20 -0800 |
| commit | 578fcb99217bdbc4501e620ade7665242f793c71 (patch) | |
| tree | d09c481de0603131a337e5d4675814b38ef35a58 /gr-vocoder/lib | |
| parent | 11169b55d16c1785c89e03f6cf58b3aa440c68d0 (diff) | |
Fixes for ABI compliance checker
do not install obsolete headers
Some header files in atsc and qtgui are installed, but have references
to obsolete paths and are therefore uncompilable. These files should
probably be removed from the checked-out source trees to complete the
refactoring, but this patch merely omits them from the install step.
This allows the abi-compliance-checker to run over the installed header
files.
codec2 embedding fixups
Only use and install the embedded copy of codec2.h when using an
embedded copy of the codec2 library. Use cmake to propagate conditional
paths from lib directory to swig directory.
make acc happy
The abi-compliance-checker operates in installed headers. So sys_pri.h
needs to look for gnuradio/realtime.h and be explicit about structure
definitions. py_feval.h needs to explicitly include Python.h.
Diffstat (limited to 'gr-vocoder/lib')
| -rw-r--r-- | gr-vocoder/lib/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt index a347cbf7fe..7e813de9a9 100644 --- a/gr-vocoder/lib/CMakeLists.txt +++ b/gr-vocoder/lib/CMakeLists.txt @@ -140,6 +140,9 @@ else (NOT DEFINED GR_USE_SYSTEM_LIBCODEC2) else (GR_USE_SYSTEM_LIBCODEC2) set(GR_USE_LOCAL_LIBCODEC2 TRUE) message(STATUS "Using gnuradio local copy of libcodec2.") + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + set(EMBEDDED_CODEC2_INCLUDE "-I\${includedir}/gnuradio/vocoder" PARENT_SCOPE) + set(EMBEDDED_CODEC2_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/gr-vocoder/lib PARENT_SCOPE) endif (GR_USE_SYSTEM_LIBCODEC2) endif (NOT DEFINED GR_USE_SYSTEM_LIBCODEC2) @@ -151,6 +154,7 @@ mark_as_advanced(LIBCODEC2_INCLUDE_DIR LIBCODEC2_LIBRARIES) ######################################################################## include_directories( ${GR_VOCODER_INCLUDE_DIRS} + ${EMBEDDED_CODEC2_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} @@ -210,6 +214,9 @@ GR_INCLUDE_SUBDIRECTORY(g7xx) if(GR_USE_LOCAL_LIBCODEC2) GR_INCLUDE_SUBDIRECTORY(codec2) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/codec2/codec2.h + DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder/codec2/ + COMPONENT "vocoder_devel") endif(GR_USE_LOCAL_LIBCODEC2) if(GR_USE_LOCAL_LIBGSM) |