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-comedi | |
| 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-comedi')
| -rw-r--r-- | gr-comedi/CMakeLists.txt | 35 | ||||
| -rw-r--r-- | gr-comedi/include/gnuradio/comedi/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-comedi/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-comedi/python/comedi/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-comedi/swig/CMakeLists.txt | 2 |
5 files changed, 2 insertions, 41 deletions
diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt index caf46ee5e8..b457971264 100644 --- a/gr-comedi/CMakeLists.txt +++ b/gr-comedi/CMakeLists.txt @@ -51,40 +51,6 @@ SET(GR_PKG_COMEDI_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/comedi) if(ENABLE_GR_COMEDI) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_COMEDI_DESCRIPTION "GNU Radio Comedi Blocks") - -CPACK_COMPONENT("comedi_runtime" - GROUP "Comedi" - DISPLAY_NAME "Runtime" - DESCRIPTION "Dynamic link libraries" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("comedi_devel" - GROUP "Comedi" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("comedi_python" - GROUP "Comedi" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime" - DEPENDS "runtime_python;comedi_runtime" -) - -CPACK_COMPONENT("comedi_swig" - GROUP "Comedi" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;comedi_python;comedi_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/comedi) @@ -105,7 +71,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-comedi.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "comedi_devel" ) endif(ENABLE_GR_COMEDI) diff --git a/gr-comedi/include/gnuradio/comedi/CMakeLists.txt b/gr-comedi/include/gnuradio/comedi/CMakeLists.txt index 51a609e421..601c1fb91d 100644 --- a/gr-comedi/include/gnuradio/comedi/CMakeLists.txt +++ b/gr-comedi/include/gnuradio/comedi/CMakeLists.txt @@ -25,6 +25,5 @@ install(FILES sink_s.h source_s.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/comedi - COMPONENT "comedi_devel" ) diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt index e6e58dc8c4..38f51fcd1b 100644 --- a/gr-comedi/lib/CMakeLists.txt +++ b/gr-comedi/lib/CMakeLists.txt @@ -54,7 +54,7 @@ list(APPEND comedi_libs add_library(gnuradio-comedi SHARED ${comedi_sources}) target_link_libraries(gnuradio-comedi ${comedi_libs}) -GR_LIBRARY_FOO(gnuradio-comedi RUNTIME_COMPONENT "comedi_runtime" DEVEL_COMPONENT "comedi_devel") +GR_LIBRARY_FOO(gnuradio-comedi) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -76,6 +76,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-comedi_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "comedi_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-comedi/python/comedi/CMakeLists.txt b/gr-comedi/python/comedi/CMakeLists.txt index 5ac692f995..e3f7031a23 100644 --- a/gr-comedi/python/comedi/CMakeLists.txt +++ b/gr-comedi/python/comedi/CMakeLists.txt @@ -26,7 +26,6 @@ GR_PYTHON_INSTALL( FILES __init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/comedi - COMPONENT "comedi_python" ) ######################################################################## diff --git a/gr-comedi/swig/CMakeLists.txt b/gr-comedi/swig/CMakeLists.txt index b31e4e87eb..d406a3002e 100644 --- a/gr-comedi/swig/CMakeLists.txt +++ b/gr-comedi/swig/CMakeLists.txt @@ -46,7 +46,6 @@ GR_SWIG_MAKE(comedi_swig comedi_swig.i) GR_SWIG_INSTALL( TARGETS comedi_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/comedi - COMPONENT "comedi_python" ) install( @@ -54,5 +53,4 @@ install( comedi_swig.i ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "comedi_swig" ) |