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-fft | |
| 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-fft')
| -rw-r--r-- | gr-fft/CMakeLists.txt | 35 | ||||
| -rw-r--r-- | gr-fft/grc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-fft/include/gnuradio/fft/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-fft/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-fft/python/fft/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-fft/swig/CMakeLists.txt | 2 |
6 files changed, 2 insertions, 44 deletions
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index 586abe56af..9ac6962c85 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -48,40 +48,6 @@ GR_SET_GLOBAL(GR_FFT_INCLUDE_DIRS if(ENABLE_GR_FFT) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_FFT_DESCRIPTION "GNU Radio FFT Blocks") - -CPACK_COMPONENT("fft_runtime" - GROUP "FFT" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("fft_devel" - GROUP "FFT" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("fft_python" - GROUP "FFT" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;fft_runtime" -) - -CPACK_COMPONENT("fft_swig" - GROUP "FFT" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;fft_python;fft_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/fft) @@ -105,7 +71,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fft.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "fft_devel" ) endif(ENABLE_GR_FFT) diff --git a/gr-fft/grc/CMakeLists.txt b/gr-fft/grc/CMakeLists.txt index cc972dfa7e..8eeb431c3e 100644 --- a/gr-fft/grc/CMakeLists.txt +++ b/gr-fft/grc/CMakeLists.txt @@ -24,5 +24,4 @@ install(FILES fft_logpwrfft_x.xml fft_ctrlport_probe_psd.xml DESTINATION ${GRC_BLOCKS_DIR} - COMPONENT "fft_python" ) diff --git a/gr-fft/include/gnuradio/fft/CMakeLists.txt b/gr-fft/include/gnuradio/fft/CMakeLists.txt index 55705ee660..0f52b0aa96 100644 --- a/gr-fft/include/gnuradio/fft/CMakeLists.txt +++ b/gr-fft/include/gnuradio/fft/CMakeLists.txt @@ -29,14 +29,11 @@ install(FILES goertzel_fc.h window.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fft - COMPONENT "fft_devel" ) if(ENABLE_GR_CTRLPORT) install(FILES ctrlport_probe_psd.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fft - COMPONENT "fft_devel" ) endif(ENABLE_GR_CTRLPORT) - diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt index 77476e58b4..9777d243df 100644 --- a/gr-fft/lib/CMakeLists.txt +++ b/gr-fft/lib/CMakeLists.txt @@ -83,7 +83,7 @@ endif() add_library(gnuradio-fft SHARED ${fft_sources}) target_link_libraries(gnuradio-fft ${fft_libs}) -GR_LIBRARY_FOO(gnuradio-fft RUNTIME_COMPONENT "fft_runtime" DEVEL_COMPONENT "fft_devel") +GR_LIBRARY_FOO(gnuradio-fft) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -105,6 +105,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-fft_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "fft_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-fft/python/fft/CMakeLists.txt b/gr-fft/python/fft/CMakeLists.txt index b5a8c9d4f7..016c76d27d 100644 --- a/gr-fft/python/fft/CMakeLists.txt +++ b/gr-fft/python/fft/CMakeLists.txt @@ -25,7 +25,6 @@ GR_PYTHON_INSTALL( __init__.py logpwrfft.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/fft - COMPONENT "fft_python" ) ######################################################################## diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt index 74a4a25b10..67e34bbba8 100644 --- a/gr-fft/swig/CMakeLists.txt +++ b/gr-fft/swig/CMakeLists.txt @@ -44,7 +44,6 @@ GR_SWIG_MAKE(fft_swig fft_swig.i) GR_SWIG_INSTALL( TARGETS fft_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/fft - COMPONENT "fft_python" ) install( @@ -52,5 +51,4 @@ install( fft_swig.i ${CMAKE_CURRENT_BINARY_DIR}/fft_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "fft_swig" ) |