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-dtv | |
| 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-dtv')
| -rw-r--r-- | gr-dtv/CMakeLists.txt | 35 | ||||
| -rw-r--r-- | gr-dtv/apps/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-dtv/examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-dtv/grc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-dtv/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-dtv/python/dtv/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-dtv/swig/CMakeLists.txt | 2 |
8 files changed, 2 insertions, 45 deletions
diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt index 5a23482b26..f045af5ef8 100644 --- a/gr-dtv/CMakeLists.txt +++ b/gr-dtv/CMakeLists.txt @@ -49,40 +49,6 @@ SET(GR_PKG_DTV_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/dtv) if(ENABLE_GR_DTV) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_DTV_DESCRIPTION "GNU Radio DTV Blocks") - -CPACK_COMPONENT("dtv_runtime" - GROUP "DTV" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("dtv_devel" - GROUP "DTV" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("dtv_python" - GROUP "DTV" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;dtv_runtime" -) - -CPACK_COMPONENT("dtv_swig" - GROUP "DTV" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;dtv_python;dtv_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/dtv) @@ -107,7 +73,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-dtv.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "dtv_devel" ) endif(ENABLE_GR_DTV) diff --git a/gr-dtv/apps/CMakeLists.txt b/gr-dtv/apps/CMakeLists.txt index f328234e3d..6de0ccec74 100644 --- a/gr-dtv/apps/CMakeLists.txt +++ b/gr-dtv/apps/CMakeLists.txt @@ -25,5 +25,4 @@ include(GrPython) GR_PYTHON_INSTALL( PROGRAMS DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "dtv_python" ) diff --git a/gr-dtv/examples/CMakeLists.txt b/gr-dtv/examples/CMakeLists.txt index 8f209bce4f..884d1daafa 100644 --- a/gr-dtv/examples/CMakeLists.txt +++ b/gr-dtv/examples/CMakeLists.txt @@ -23,7 +23,6 @@ GR_PYTHON_INSTALL( PROGRAMS atsc_ctrlport_monitor.py DESTINATION ${GR_PKG_DTV_EXAMPLES_DIR} - COMPONENT "dtv_python" ) install( @@ -47,5 +46,4 @@ install( vv018-miso.grc catv_tx_64qam.grc DESTINATION ${GR_PKG_DTV_EXAMPLES_DIR} - COMPONENT "dtv_python" ) diff --git a/gr-dtv/grc/CMakeLists.txt b/gr-dtv/grc/CMakeLists.txt index a1386c5adf..e226d09976 100644 --- a/gr-dtv/grc/CMakeLists.txt +++ b/gr-dtv/grc/CMakeLists.txt @@ -74,5 +74,4 @@ install(FILES dtv_catv_frame_sync_enc_bb.xml dtv_catv_trellis_enc_bb.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "dtv_python" ) diff --git a/gr-dtv/include/gnuradio/dtv/CMakeLists.txt b/gr-dtv/include/gnuradio/dtv/CMakeLists.txt index 620dd55879..ce15d99a3f 100644 --- a/gr-dtv/include/gnuradio/dtv/CMakeLists.txt +++ b/gr-dtv/include/gnuradio/dtv/CMakeLists.txt @@ -81,5 +81,4 @@ install(FILES catv_trellis_enc_bb.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/dtv - COMPONENT "dtv_devel" ) diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt index 67b8a0ea48..7ffcc435de 100644 --- a/gr-dtv/lib/CMakeLists.txt +++ b/gr-dtv/lib/CMakeLists.txt @@ -116,7 +116,7 @@ list(APPEND dtv_libs include (CheckCCompilerFlag) if (MSVC) - # 64-bit MSVC always supports SSE2 + # 64-bit MSVC always supports SSE2 if (CMAKE_SIZEOF_VOID_P EQUAL 8) set(SSE2_SUPPORTED true) else () @@ -153,4 +153,4 @@ endif(MSVC) add_library(gnuradio-dtv SHARED ${dtv_sources}) target_link_libraries(gnuradio-dtv ${dtv_libs}) -GR_LIBRARY_FOO(gnuradio-dtv RUNTIME_COMPONENT "dtv_runtime" DEVEL_COMPONENT "dtv_devel") +GR_LIBRARY_FOO(gnuradio-dtv) diff --git a/gr-dtv/python/dtv/CMakeLists.txt b/gr-dtv/python/dtv/CMakeLists.txt index 543c2c14cf..e39b21cbb9 100644 --- a/gr-dtv/python/dtv/CMakeLists.txt +++ b/gr-dtv/python/dtv/CMakeLists.txt @@ -28,7 +28,6 @@ GR_PYTHON_INSTALL( atsc_rx.py atsc_rx_filter.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/dtv - COMPONENT "dtv_python" ) ######################################################################## diff --git a/gr-dtv/swig/CMakeLists.txt b/gr-dtv/swig/CMakeLists.txt index 04b8b09ec7..7e98fa3b45 100644 --- a/gr-dtv/swig/CMakeLists.txt +++ b/gr-dtv/swig/CMakeLists.txt @@ -43,7 +43,6 @@ GR_SWIG_MAKE(dtv_swig dtv_swig.i) GR_SWIG_INSTALL( TARGETS dtv_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/dtv - COMPONENT "dtv_python" ) install( @@ -51,5 +50,4 @@ install( dtv_swig.i ${CMAKE_CURRENT_BINARY_DIR}/dtv_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "dtv_swig" ) |