diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 16:09:50 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 16:09:50 -0700 |
| commit | 675afc063c9ca5ccec3ede43d87aac83c1928182 (patch) | |
| tree | f342b9a24c8c5e93cadce05fc8714001fc0e2ac9 /gr-vocoder | |
| parent | e2ede2ef8e46762369816d7d66425aee9dca5d1e (diff) | |
| parent | c7692c32cd91c0e98672ce0e997d35f9d3461dd3 (diff) | |
Merge remote-tracking branch 'github/nuke-cpack' into next
Conflicts:
gr-vocoder/CMakeLists.txt
Diffstat (limited to 'gr-vocoder')
| -rw-r--r-- | gr-vocoder/CMakeLists.txt | 42 | ||||
| -rw-r--r-- | gr-vocoder/examples/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-vocoder/grc/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-vocoder/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-vocoder/python/vocoder/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-vocoder/swig/CMakeLists.txt | 2 |
7 files changed, 2 insertions, 56 deletions
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt index 56ba2a9639..686378f2a7 100644 --- a/gr-vocoder/CMakeLists.txt +++ b/gr-vocoder/CMakeLists.txt @@ -48,47 +48,6 @@ SET(GR_PKG_VOCODER_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/vocoder) if(ENABLE_GR_VOCODER) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_VOCODER_DESCRIPTION "GNU Radio Vocoder Blocks") - -CPACK_COMPONENT("vocoder_runtime" - GROUP "Vocoder" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("vocoder_devel" - GROUP "Vocoder" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("vocoder_python" - GROUP "Vocoder" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "runtime_python;vocoder_runtime" -) - -CPACK_COMPONENT("vocoder_examples" - GROUP "Vocoder" - DISPLAY_NAME "Examples" - DESCRIPTION "Python examples for vocoder" - DEPENDS "vocoder_python" -) - -CPACK_COMPONENT("vocoder_swig" - GROUP "Vocoder" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;vocoder_python;vocoder_devel" -) - -######################################################################## ## CODEC2 Support ######################################################################## find_package(Codec2) @@ -135,7 +94,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-vocoder.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "vocoder_devel" ) endif(ENABLE_GR_VOCODER) diff --git a/gr-vocoder/examples/CMakeLists.txt b/gr-vocoder/examples/CMakeLists.txt index 0957d81eb6..e5895c8d8a 100644 --- a/gr-vocoder/examples/CMakeLists.txt +++ b/gr-vocoder/examples/CMakeLists.txt @@ -31,14 +31,12 @@ GR_PYTHON_INSTALL( g723_40_audio_loopback.py ulaw_audio_loopback.py DESTINATION ${GR_PKG_VOCODER_EXAMPLES_DIR} - COMPONENT "vocoder_examples" ) if(LIBCODEC2_FOUND) GR_PYTHON_INSTALL( PROGRAMS codec2_audio_loopback.py DESTINATION ${GR_PKG_VOCODER_EXAMPLES_DIR} - COMPONENT "vocoder_examples" ) endif(LIBCODEC2_FOUND) if(LIBGSM_FOUND) @@ -46,6 +44,5 @@ if(LIBGSM_FOUND) PROGRAMS gsm_audio_loopback.py DESTINATION ${GR_PKG_VOCODER_EXAMPLES_DIR} - COMPONENT "vocoder_examples" ) endif(LIBGSM_FOUND) diff --git a/gr-vocoder/grc/CMakeLists.txt b/gr-vocoder/grc/CMakeLists.txt index e6c8115dbe..fd320545ad 100644 --- a/gr-vocoder/grc/CMakeLists.txt +++ b/gr-vocoder/grc/CMakeLists.txt @@ -34,7 +34,6 @@ install(FILES vocoder_ulaw_decode_bs.xml vocoder_ulaw_encode_sb.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "vocoder_python" ) if(LIBCODEC2_FOUND) @@ -42,7 +41,6 @@ if(LIBCODEC2_FOUND) vocoder_codec2_decode_ps.xml vocoder_codec2_encode_sp.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "vocoder_python" ) endif(LIBCODEC2_FOUND) @@ -51,6 +49,5 @@ if(LIBGSM_FOUND) vocoder_gsm_fr_decode_ps.xml vocoder_gsm_fr_encode_sp.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "vocoder_python" ) endif(LIBGSM_FOUND) diff --git a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt index 13efea7add..172f18a730 100644 --- a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt +++ b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt @@ -35,7 +35,6 @@ install(FILES ulaw_decode_bs.h ulaw_encode_sb.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder - COMPONENT "vocoder_devel" ) if(LIBCODEC2_FOUND) install(FILES @@ -43,7 +42,6 @@ install(FILES codec2_decode_ps.h codec2_encode_sp.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder - COMPONENT "vocoder_devel" ) endif(LIBCODEC2_FOUND) if(LIBGSM_FOUND) @@ -51,6 +49,5 @@ install(FILES gsm_fr_decode_ps.h gsm_fr_encode_sp.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder - COMPONENT "vocoder_devel" ) endif(LIBGSM_FOUND) diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt index a8fc874d31..5e806a2c2c 100644 --- a/gr-vocoder/lib/CMakeLists.txt +++ b/gr-vocoder/lib/CMakeLists.txt @@ -103,7 +103,7 @@ endif(LIBGSM_LIBRARIES) add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources}) target_link_libraries(gnuradio-vocoder ${vocoder_libs}) -GR_LIBRARY_FOO(gnuradio-vocoder RUNTIME_COMPONENT "vocoder_runtime" DEVEL_COMPONENT "vocoder_devel") +GR_LIBRARY_FOO(gnuradio-vocoder) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -125,6 +125,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-vocoder_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "vocoder_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-vocoder/python/vocoder/CMakeLists.txt b/gr-vocoder/python/vocoder/CMakeLists.txt index 12f7e77d7c..d4fe3d9e8c 100644 --- a/gr-vocoder/python/vocoder/CMakeLists.txt +++ b/gr-vocoder/python/vocoder/CMakeLists.txt @@ -27,7 +27,6 @@ GR_PYTHON_INSTALL( __init__.py cvsd.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/vocoder - COMPONENT "vocoder_python" ) ######################################################################## diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt index 3eb7a83f31..8597fb115c 100644 --- a/gr-vocoder/swig/CMakeLists.txt +++ b/gr-vocoder/swig/CMakeLists.txt @@ -52,7 +52,6 @@ GR_SWIG_MAKE(vocoder_swig vocoder_swig.i) GR_SWIG_INSTALL( TARGETS vocoder_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/vocoder - COMPONENT "vocoder_python" ) install( @@ -60,5 +59,4 @@ install( vocoder_swig.i ${CMAKE_CURRENT_BINARY_DIR}/vocoder_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "vocoder_swig" ) |