summaryrefslogtreecommitdiff
path: root/gr-filter
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2016-08-03 13:47:27 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2016-08-03 13:47:27 -0700
commitc7692c32cd91c0e98672ce0e997d35f9d3461dd3 (patch)
tree692a649a886250bf06dc56a5fabe73e4492a1efa /gr-filter
parent77f902e1a7d731805cfcd1a15d22d149898709b0 (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-filter')
-rw-r--r--gr-filter/CMakeLists.txt35
-rw-r--r--gr-filter/apps/CMakeLists.txt1
-rw-r--r--gr-filter/examples/CMakeLists.txt2
-rw-r--r--gr-filter/grc/CMakeLists.txt1
-rw-r--r--gr-filter/include/gnuradio/filter/CMakeLists.txt1
-rw-r--r--gr-filter/lib/CMakeLists.txt4
-rw-r--r--gr-filter/python/filter/CMakeLists.txt1
-rw-r--r--gr-filter/python/filter/design/CMakeLists.txt1
-rw-r--r--gr-filter/python/filter/gui/CMakeLists.txt1
-rw-r--r--gr-filter/swig/CMakeLists.txt2
10 files changed, 2 insertions, 47 deletions
diff --git a/gr-filter/CMakeLists.txt b/gr-filter/CMakeLists.txt
index c0d46d521a..972cd2c8b0 100644
--- a/gr-filter/CMakeLists.txt
+++ b/gr-filter/CMakeLists.txt
@@ -51,40 +51,6 @@ SET(GR_PKG_FILTER_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/filter)
if(ENABLE_GR_FILTER)
########################################################################
-# Setup CPack components
-########################################################################
-include(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_FILTER_DESCRIPTION "GNU Radio Filter Blocks")
-
-CPACK_COMPONENT("filter_runtime"
- GROUP "Filter"
- DISPLAY_NAME "Runtime"
- DESCRIPTION "Runtime"
- DEPENDS "runtime_runtime"
-)
-
-CPACK_COMPONENT("filter_devel"
- GROUP "Filter"
- DISPLAY_NAME "Development"
- DESCRIPTION "C++ headers, package config, import libraries"
- DEPENDS "runtime_devel"
-)
-
-CPACK_COMPONENT("filter_python"
- GROUP "Filter"
- DISPLAY_NAME "Python"
- DESCRIPTION "Python modules for runtime; GRC xml files"
- DEPENDS "runtime_python;filter_runtime"
-)
-
-CPACK_COMPONENT("filter_swig"
- GROUP "Filter"
- DISPLAY_NAME "SWIG"
- DESCRIPTION "SWIG development .i files"
- DEPENDS "runtime_swig;filter_python;filter_devel"
-)
-
-########################################################################
# Add subdirectories
########################################################################
add_subdirectory(include/gnuradio/filter)
@@ -111,7 +77,6 @@ configure_file(
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-filter.pc
DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
- COMPONENT "filter_devel"
)
endif(ENABLE_GR_FILTER)
diff --git a/gr-filter/apps/CMakeLists.txt b/gr-filter/apps/CMakeLists.txt
index 61e2f183ad..8df2c025c6 100644
--- a/gr-filter/apps/CMakeLists.txt
+++ b/gr-filter/apps/CMakeLists.txt
@@ -26,5 +26,4 @@ GR_PYTHON_INSTALL(
PROGRAMS
gr_filter_design
DESTINATION ${GR_RUNTIME_DIR}
- COMPONENT "filter_python"
)
diff --git a/gr-filter/examples/CMakeLists.txt b/gr-filter/examples/CMakeLists.txt
index a6229f38f4..c7410a839c 100644
--- a/gr-filter/examples/CMakeLists.txt
+++ b/gr-filter/examples/CMakeLists.txt
@@ -37,7 +37,6 @@ GR_PYTHON_INSTALL(PROGRAMS
gr_filtdes_restrict.py
gr_filtdes_live_upd.py
DESTINATION ${GR_PKG_FILTER_EXAMPLES_DIR}
- COMPONENT "filter_python"
)
install(
@@ -45,5 +44,4 @@ install(
filter_taps.grc
resampler_demo.grc
DESTINATION ${GR_PKG_FILTER_EXAMPLES_DIR}
- COMPONENT "filter_python"
)
diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt
index b3bc2e1828..6c67a5a6ae 100644
--- a/gr-filter/grc/CMakeLists.txt
+++ b/gr-filter/grc/CMakeLists.txt
@@ -51,5 +51,4 @@ install(FILES
variable_band_reject_filter_taps.xml
variable_rrc_filter_taps.xml
DESTINATION ${GRC_BLOCKS_DIR}
- COMPONENT "filter_python"
)
diff --git a/gr-filter/include/gnuradio/filter/CMakeLists.txt b/gr-filter/include/gnuradio/filter/CMakeLists.txt
index e75f02b7a2..7ad692743a 100644
--- a/gr-filter/include/gnuradio/filter/CMakeLists.txt
+++ b/gr-filter/include/gnuradio/filter/CMakeLists.txt
@@ -76,6 +76,5 @@ install(FILES
single_pole_iir_filter_cc.h
single_pole_iir_filter_ff.h
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/filter
- COMPONENT "filter_devel"
)
diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt
index feabe73be7..ff869eafe5 100644
--- a/gr-filter/lib/CMakeLists.txt
+++ b/gr-filter/lib/CMakeLists.txt
@@ -119,7 +119,7 @@ list(APPEND filter_libs
add_library(gnuradio-filter SHARED ${filter_sources})
target_link_libraries(gnuradio-filter ${filter_libs})
-GR_LIBRARY_FOO(gnuradio-filter RUNTIME_COMPONENT "filter_runtime" DEVEL_COMPONENT "filter_devel")
+GR_LIBRARY_FOO(gnuradio-filter)
add_dependencies(gnuradio-filter
filter_generated_includes filter_generated_swigs
gnuradio-runtime gnuradio-fft)
@@ -148,7 +148,7 @@ if(ENABLE_STATIC_LIBS)
endif(NOT WIN32)
install(TARGETS gnuradio-filter_static
- ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "filter_devel" # .lib file
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
)
endif(ENABLE_STATIC_LIBS)
diff --git a/gr-filter/python/filter/CMakeLists.txt b/gr-filter/python/filter/CMakeLists.txt
index 1dd055abaf..bc4892412e 100644
--- a/gr-filter/python/filter/CMakeLists.txt
+++ b/gr-filter/python/filter/CMakeLists.txt
@@ -29,7 +29,6 @@ GR_PYTHON_INSTALL(
pfb.py
rational_resampler.py
DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter
- COMPONENT "filter_python"
)
########################################################################
diff --git a/gr-filter/python/filter/design/CMakeLists.txt b/gr-filter/python/filter/design/CMakeLists.txt
index 21e47b86d6..2c800e9148 100644
--- a/gr-filter/python/filter/design/CMakeLists.txt
+++ b/gr-filter/python/filter/design/CMakeLists.txt
@@ -26,6 +26,5 @@ GR_PYTHON_INSTALL(
filter_design.py
fir_design.py
DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter
- COMPONENT "filter_python"
)
diff --git a/gr-filter/python/filter/gui/CMakeLists.txt b/gr-filter/python/filter/gui/CMakeLists.txt
index 6c9bbfa2f3..6c1d98894f 100644
--- a/gr-filter/python/filter/gui/CMakeLists.txt
+++ b/gr-filter/python/filter/gui/CMakeLists.txt
@@ -29,6 +29,5 @@ GR_PYTHON_INSTALL(
polezero_plot.py
pyqt_filter_stacked.py
DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter
- COMPONENT "filter_python"
)
diff --git a/gr-filter/swig/CMakeLists.txt b/gr-filter/swig/CMakeLists.txt
index b7bf203d16..ee8389dddb 100644
--- a/gr-filter/swig/CMakeLists.txt
+++ b/gr-filter/swig/CMakeLists.txt
@@ -50,7 +50,6 @@ GR_SWIG_MAKE(filter_swig filter_swig.i)
GR_SWIG_INSTALL(
TARGETS filter_swig
DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter
- COMPONENT "filter_python"
)
install(
@@ -58,5 +57,4 @@ install(
filter_swig.i
${CMAKE_CURRENT_BINARY_DIR}/gr_filter_swig_doc.i
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
- COMPONENT "filter_swig"
)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 03:54:04 +0000