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-wavelet | |
| 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-wavelet')
| -rw-r--r-- | gr-wavelet/CMakeLists.txt | 35 | ||||
| -rw-r--r-- | gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-wavelet/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-wavelet/python/wavelet/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-wavelet/swig/CMakeLists.txt | 2 |
5 files changed, 2 insertions, 41 deletions
diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt index bdc19a1ebc..aab17ae7f3 100644 --- a/gr-wavelet/CMakeLists.txt +++ b/gr-wavelet/CMakeLists.txt @@ -48,40 +48,6 @@ GR_SET_GLOBAL(GR_WAVELET_INCLUDE_DIRS if(ENABLE_GR_WAVELET) ######################################################################## -# Setup CPack components -######################################################################## -include(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_WAVELET_DESCRIPTION "GNU Radio Wavelet Blocks") - -CPACK_COMPONENT("wavelet_runtime" - GROUP "WAVELET" - DISPLAY_NAME "Runtime" - DESCRIPTION "Runtime" - DEPENDS "runtime_runtime" -) - -CPACK_COMPONENT("wavelet_devel" - GROUP "WAVELET" - DISPLAY_NAME "Development" - DESCRIPTION "C++ headers, package config, import libraries" - DEPENDS "runtime_devel" -) - -CPACK_COMPONENT("wavelet_python" - GROUP "WAVELET" - DISPLAY_NAME "Python" - DESCRIPTION "Python modules for runtime; GRC xml files" - DEPENDS "runtime_python;wavelet_runtime" -) - -CPACK_COMPONENT("wavelet_swig" - GROUP "WAVELET" - DISPLAY_NAME "SWIG" - DESCRIPTION "SWIG development .i files" - DEPENDS "runtime_swig;wavelet_python;wavelet_devel" -) - -######################################################################## # Add subdirectories ######################################################################## add_subdirectory(include/gnuradio/wavelet) @@ -105,7 +71,6 @@ configure_file( install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-wavelet.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig - COMPONENT "wavelet_devel" ) endif(ENABLE_GR_WAVELET) diff --git a/gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt b/gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt index 43c1603d15..c1fcd9c3ea 100644 --- a/gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt +++ b/gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt @@ -26,6 +26,5 @@ install(FILES wavelet_ff.h wvps_ff.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/wavelet - COMPONENT "wavelet_devel" ) diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index be2a7a8471..3ae8e591af 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -85,7 +85,7 @@ if(CMAKE_COMPILER_IS_GNUCC AND NOT APPLE) SET_TARGET_PROPERTIES(gnuradio-wavelet PROPERTIES LINK_FLAGS "-Wl,--no-as-needed") endif() -GR_LIBRARY_FOO(gnuradio-wavelet RUNTIME_COMPONENT "wavelet_runtime" DEVEL_COMPONENT "wavelet_devel") +GR_LIBRARY_FOO(gnuradio-wavelet) add_dependencies(gnuradio-wavelet wavelet_generated_includes wavelet_generated_swigs gnuradio-runtime) @@ -113,6 +113,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-wavelet_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "wavelet_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-wavelet/python/wavelet/CMakeLists.txt b/gr-wavelet/python/wavelet/CMakeLists.txt index bb88c50b65..9e1961d4e0 100644 --- a/gr-wavelet/python/wavelet/CMakeLists.txt +++ b/gr-wavelet/python/wavelet/CMakeLists.txt @@ -24,7 +24,6 @@ GR_PYTHON_INSTALL( FILES __init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/wavelet - COMPONENT "wavelet_python" ) ######################################################################## diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt index 1f31497844..d9bc02edab 100644 --- a/gr-wavelet/swig/CMakeLists.txt +++ b/gr-wavelet/swig/CMakeLists.txt @@ -46,7 +46,6 @@ GR_SWIG_MAKE(wavelet_swig wavelet_swig.i) GR_SWIG_INSTALL( TARGETS wavelet_swig DESTINATION ${GR_PYTHON_DIR}/gnuradio/wavelet - COMPONENT "wavelet_python" ) install( @@ -54,5 +53,4 @@ install( wavelet_swig.i ${CMAKE_CURRENT_BINARY_DIR}/wavelet_swig_doc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig - COMPONENT "wavelet_swig" ) |