7 files changed, 3 insertions, 43 deletions
diff --git a/gr-channels/CMakeLists.txt b/gr-channels/CMakeLists.txt
index 2b5b4cd7d5..9e5deeedcf 100644
--- a/gr-channels/CMakeLists.txt
+++ b/gr-channels/CMakeLists.txt
@@ -50,40 +50,6 @@ SET(GR_PKG_CHANNELS_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/channels)
 if(ENABLE_GR_CHANNELS)
 
 ########################################################################
-# Setup CPack components
-########################################################################
-include(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_CHANNELS_DESCRIPTION "GNU Radio Channel Model Blocks")
-
-CPACK_COMPONENT("channels_runtime"
-    GROUP        "Channel Models"
-    DISPLAY_NAME "Runtime"
-    DESCRIPTION  "Runtime"
-    DEPENDS      "runtime_runtime"
-)
-
-CPACK_COMPONENT("channels_devel"
-    GROUP        "Channel Models"
-    DISPLAY_NAME "Development"
-    DESCRIPTION  "C++ headers, package config, import libraries"
-    DEPENDS      "runtime_devel"
-)
-
-CPACK_COMPONENT("channels_python"
-    GROUP        "Channel Models"
-    DISPLAY_NAME "Python"
-    DESCRIPTION  "Python modules for runtime; GRC xml files"
-    DEPENDS      "runtime_python;channels_runtime"
-)
-
-CPACK_COMPONENT("channels_swig"
-    GROUP        "Channel Models"
-    DISPLAY_NAME "SWIG"
-    DESCRIPTION  "SWIG development .i files"
-    DEPENDS      "runtime_swig;channels_python;channels_devel"
-)
-
-########################################################################
 # Add subdirectories
 ########################################################################
 add_subdirectory(include/gnuradio/channels)
@@ -107,7 +73,6 @@ configure_file(
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-channels.pc
     DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
-    COMPONENT "channels_devel"
 )
 
 endif(ENABLE_GR_CHANNELS)
diff --git a/gr-channels/examples/CMakeLists.txt b/gr-channels/examples/CMakeLists.txt
index af33a8f66f..caf7677830 100644
--- a/gr-channels/examples/CMakeLists.txt
+++ b/gr-channels/examples/CMakeLists.txt
@@ -29,5 +29,4 @@ install(
   demo_qam.grc
   demo_ofdm.grc
   DESTINATION ${GR_PKG_CHANNELS_EXAMPLES_DIR}
-  COMPONENT "channels_python"
 )
diff --git a/gr-channels/grc/CMakeLists.txt b/gr-channels/grc/CMakeLists.txt
index 75e2bc0ddd..c85170b4ea 100644
--- a/gr-channels/grc/CMakeLists.txt
+++ b/gr-channels/grc/CMakeLists.txt
@@ -19,5 +19,5 @@
 
 file(GLOB xml_files "*.xml")
 install(FILES ${xml_files}
-    DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "channels_python"
+    DESTINATION ${GRC_BLOCKS_DIR}
 )
diff --git a/gr-channels/include/gnuradio/channels/CMakeLists.txt b/gr-channels/include/gnuradio/channels/CMakeLists.txt
index 6fac10e306..e41c7cc927 100644
--- a/gr-channels/include/gnuradio/channels/CMakeLists.txt
+++ b/gr-channels/include/gnuradio/channels/CMakeLists.txt
@@ -28,6 +28,5 @@ install(FILES
     selective_fading_model.h
     selective_fading_model2.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/channels
-    COMPONENT "channels_devel"
 )
 
diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt
index 34726c1715..d025889edb 100644
--- a/gr-channels/lib/CMakeLists.txt
+++ b/gr-channels/lib/CMakeLists.txt
@@ -77,7 +77,7 @@ list(APPEND channels_libs
 
 add_library(gnuradio-channels SHARED ${channels_sources})
 target_link_libraries(gnuradio-channels ${channels_libs})
-GR_LIBRARY_FOO(gnuradio-channels RUNTIME_COMPONENT "channels_runtime" DEVEL_COMPONENT "channels_devel")
+GR_LIBRARY_FOO(gnuradio-channels)
 add_dependencies(gnuradio-channels
   channels_generated_includes channels_generated_swigs
   gnuradio-runtime gnuradio-filter gnuradio-analog gnuradio-blocks)
@@ -109,6 +109,6 @@ if(ENABLE_STATIC_LIBS)
   endif(NOT WIN32)
 
   install(TARGETS gnuradio-channels_static
-    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "channels_devel"   # .lib file
+    ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
     )
 endif(ENABLE_STATIC_LIBS)
diff --git a/gr-channels/python/channels/CMakeLists.txt b/gr-channels/python/channels/CMakeLists.txt
index 0e36b94a90..a91033df75 100644
--- a/gr-channels/python/channels/CMakeLists.txt
+++ b/gr-channels/python/channels/CMakeLists.txt
@@ -33,7 +33,6 @@ GR_PYTHON_INSTALL(
     phase_noise_gen.py
     quantizer.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/channels
-    COMPONENT "channels_python"
 )
 
 ########################################################################
diff --git a/gr-channels/swig/CMakeLists.txt b/gr-channels/swig/CMakeLists.txt
index 3a85626e98..55b7ea7a47 100644
--- a/gr-channels/swig/CMakeLists.txt
+++ b/gr-channels/swig/CMakeLists.txt
@@ -44,7 +44,6 @@ GR_SWIG_MAKE(channels_swig channels_swig.i)
 GR_SWIG_INSTALL(
     TARGETS channels_swig
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/channels
-    COMPONENT "channels_python"
 )
 
 install(
@@ -52,5 +51,4 @@ install(
     channels_swig.i
     ${CMAKE_CURRENT_BINARY_DIR}/channels_swig_doc.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-    COMPONENT "channels_swig"
 )