diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 13:47:27 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 13:47:27 -0700 |
| commit | c7692c32cd91c0e98672ce0e997d35f9d3461dd3 (patch) | |
| tree | 692a649a886250bf06dc56a5fabe73e4492a1efa /gr-trellis | |
| parent | 77f902e1a7d731805cfcd1a15d22d149898709b0 (diff) | |
cmake: nuke cpack from existence
CPack is not used, unmaintaned, and broken.
This does not eliminate any MSVC build functionality.
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/CMakeLists.txt | 48 | ||||
| -rw-r--r-- | gr-trellis/doc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-trellis/examples/grc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-trellis/examples/python/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-trellis/grc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-trellis/include/gnuradio/trellis/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-trellis/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-trellis/python/trellis/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-trellis/swig/CMakeLists.txt | 2 |
9 files changed, 2 insertions, 61 deletions
diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt index a3f0ad486c..20c1c6b54d 100644 --- a/gr-trellis/CMakeLists.txt +++ b/gr-trellis/CMakeLists.txt @@ -51,53 +51,6 @@ SET(GR_PKG_TRELLIS_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/trellis) if(ENABLE_GR_TRELLIS) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_TRELLIS_DESCRIPTION "GNU Radio Trellis Blocks") - -CPACK_COMPONENT("trellis_docs" - GROUP "Trellis" - DISPLAY_NAME "Documentation" - DESCRIPTION "Doxygen HTML and XML" -) - -CPACK_COMPONENT("trellis_runtime" - GROUP "Trellis" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("trellis_devel" - GROUP "Trellis" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("trellis_python" - GROUP "Trellis" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "runtime_python;trellis_runtime" -) - -CPACK_COMPONENT("trellis_examples" - GROUP "Trellis" - DISPLAY_NAME "Examples" - DESCRIPTION "Python examples for trellis" - DEPENDS "trellis_python" -) - -CPACK_COMPONENT("trellis_swig" - GROUP "Trellis" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;trellis_python;trellis_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/trellis) @@ -122,7 +75,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "trellis_devel" ) endif(ENABLE_GR_TRELLIS) diff --git a/gr-trellis/doc/CMakeLists.txt b/gr-trellis/doc/CMakeLists.txt index 568539582d..06813258f3 100644 --- a/gr-trellis/doc/CMakeLists.txt +++ b/gr-trellis/doc/CMakeLists.txt @@ -35,7 +35,6 @@ add_custom_target(gr_trellis_html ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gr-tre install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html DESTINATION ${GR_PKG_DOC_DIR}/html - COMPONENT "trellis_docs" ) endif(XMLTO_EXECUTABLE) @@ -69,5 +68,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml ${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml DESTINATION ${GR_PKG_DOC_DIR}/xml - COMPONENT "trellis_docs" ) diff --git a/gr-trellis/examples/grc/CMakeLists.txt b/gr-trellis/examples/grc/CMakeLists.txt index c5d4fc8965..a4718dd59b 100644 --- a/gr-trellis/examples/grc/CMakeLists.txt +++ b/gr-trellis/examples/grc/CMakeLists.txt @@ -59,5 +59,4 @@ install( ${CMAKE_CURRENT_BINARY_DIR}/interference_cancellation.grc readme.txt DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR} - COMPONENT "trellis-examples" ) diff --git a/gr-trellis/examples/python/CMakeLists.txt b/gr-trellis/examples/python/CMakeLists.txt index 8a05525bc4..76c88ee2f4 100644 --- a/gr-trellis/examples/python/CMakeLists.txt +++ b/gr-trellis/examples/python/CMakeLists.txt @@ -24,13 +24,11 @@ GR_PYTHON_INSTALL( test_tcm.py test_cpm.py DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR} - COMPONENT "trellis_examples" ) install( FILES README DESTINATION ${GR_PKG_DATA_DIR}/examples/trellis - COMPONENT "trellis_examples" ) install( @@ -68,5 +66,4 @@ install( fsm_files/simple.fsm fsm_files/uncoded4.fsm DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR}/fsm_files - COMPONENT "trellis_examples" ) diff --git a/gr-trellis/grc/CMakeLists.txt b/gr-trellis/grc/CMakeLists.txt index d60d64872c..9fbadd50d8 100644 --- a/gr-trellis/grc/CMakeLists.txt +++ b/gr-trellis/grc/CMakeLists.txt @@ -32,5 +32,4 @@ install(FILES trellis_pccc_decoder_x.xml trellis_pccc_decoder_combined_xx.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "trellis_python" ) diff --git a/gr-trellis/include/gnuradio/trellis/CMakeLists.txt b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt index ef60ce7370..831f2916dc 100644 --- a/gr-trellis/include/gnuradio/trellis/CMakeLists.txt +++ b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt @@ -54,6 +54,5 @@ install(FILES siso_combined_f.h siso_f.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/trellis - COMPONENT "trellis_devel" ) diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt index 9c51d06604..3d268c608f 100644 --- a/gr-trellis/lib/CMakeLists.txt +++ b/gr-trellis/lib/CMakeLists.txt @@ -90,7 +90,7 @@ ENDIF(MSVC) add_library(gnuradio-trellis SHARED ${trellis_sources}) target_link_libraries(gnuradio-trellis ${trellis_libs}) -GR_LIBRARY_FOO(gnuradio-trellis RUNTIME_COMPONENT "trellis_runtime" DEVEL_COMPONENT "trellis_devel") +GR_LIBRARY_FOO(gnuradio-trellis) add_dependencies(gnuradio-trellis trellis_generated_includes trellis_generated_swigs gnuradio-runtime gnuradio-digital) @@ -120,6 +120,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-trellis_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "trellis_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-trellis/python/trellis/CMakeLists.txt b/gr-trellis/python/trellis/CMakeLists.txt index 5cfe927412..10fd9d5c0e 100644 --- a/gr-trellis/python/trellis/CMakeLists.txt +++ b/gr-trellis/python/trellis/CMakeLists.txt @@ -27,7 +27,6 @@ GR_PYTHON_INSTALL( __init__.py fsm_utils.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/trellis - COMPONENT "trellis_python" ) ######################################################################## diff --git a/gr-trellis/swig/CMakeLists.txt b/gr-trellis/swig/CMakeLists.txt index d03d0998ef..e1ee66cba0 100644 --- a/gr-trellis/swig/CMakeLists.txt +++ b/gr-trellis/swig/CMakeLists.txt @@ -50,7 +50,6 @@ GR_SWIG_MAKE(trellis_swig trellis_swig.i) GR_SWIG_INSTALL( TARGETS trellis_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/trellis - COMPONENT "trellis_python" ) install( @@ -58,5 +57,4 @@ install( trellis_swig.i ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "trellis_swig" ) |