12 files changed, 5 insertions, 55 deletions
diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt
index 685f5736fb..6f573a09b1 100644
--- a/gr-blocks/CMakeLists.txt
+++ b/gr-blocks/CMakeLists.txt
@@ -44,40 +44,6 @@ GR_SET_GLOBAL(GR_BLOCKS_INCLUDE_DIRS
 if(ENABLE_GR_BLOCKS)
 
 ########################################################################
-# Setup CPack components
-########################################################################
-include(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_BLOCKS_DESCRIPTION "GNU Radio Basic Blocks")
-
-CPACK_COMPONENT("blocks_runtime"
-    GROUP        "Blocks"
-    DISPLAY_NAME "Runtime"
-    DESCRIPTION  "Runtime"
-    DEPENDS      "runtime_runtime"
-)
-
-CPACK_COMPONENT("blocks_devel"
-    GROUP        "Blocks"
-    DISPLAY_NAME "Development"
-    DESCRIPTION  "C++ headers, package config, import libraries"
-    DEPENDS      "runtime_devel"
-)
-
-CPACK_COMPONENT("blocks_python"
-    GROUP        "Blocks"
-    DISPLAY_NAME "Python"
-    DESCRIPTION  "Python modules for runtime; GRC xml files"
-    DEPENDS      "runtime_python;blocks_runtime"
-)
-
-CPACK_COMPONENT("blocks_swig"
-    GROUP        "Blocks"
-    DISPLAY_NAME "SWIG"
-    DESCRIPTION  "SWIG development .i files"
-    DEPENDS      "runtime_swig;blocks_python;blocks_devel"
-)
-
-########################################################################
 # Add subdirectories
 ########################################################################
 add_subdirectory(include/gnuradio/blocks)
@@ -105,7 +71,6 @@ configure_file(
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-blocks.pc
     DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
-    COMPONENT "blocks_devel"
 )
 
 endif(ENABLE_GR_BLOCKS)
diff --git a/gr-blocks/examples/CMakeLists.txt b/gr-blocks/examples/CMakeLists.txt
index 8be56d0b9d..850672e404 100644
--- a/gr-blocks/examples/CMakeLists.txt
+++ b/gr-blocks/examples/CMakeLists.txt
@@ -22,9 +22,8 @@ install(
   matrix_multiplexer.grc
   peak_detector2.grc
   vector_source_with_tags.grc
-  test_stream_mux_tags.grc 
+  test_stream_mux_tags.grc
   DESTINATION ${GR_PKG_DATA_DIR}/examples/blocks
-  COMPONENT "runtime_python"
 )
 
 add_subdirectory(metadata)
diff --git a/gr-blocks/examples/ctrlport/CMakeLists.txt b/gr-blocks/examples/ctrlport/CMakeLists.txt
index 23d2db129f..c9b39bcaaa 100644
--- a/gr-blocks/examples/ctrlport/CMakeLists.txt
+++ b/gr-blocks/examples/ctrlport/CMakeLists.txt
@@ -26,12 +26,10 @@ install(
   simple_copy.grc
   usrp_source_control.grc
   DESTINATION ${GR_PKG_DATA_DIR}/examples/ctrlport
-  COMPONENT "runtime_python"
 )
 
 GR_PYTHON_INSTALL(PROGRAMS
   simple_copy_controller.py
   usrp_source_controller.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/ctrlport
-  COMPONENT "runtime_python"
 )
diff --git a/gr-blocks/examples/metadata/CMakeLists.txt b/gr-blocks/examples/metadata/CMakeLists.txt
index 8d7bbe79e0..418b2d2594 100644
--- a/gr-blocks/examples/metadata/CMakeLists.txt
+++ b/gr-blocks/examples/metadata/CMakeLists.txt
@@ -26,5 +26,4 @@ install(
   file_metadata_vector_sink.grc
   file_metadata_vector_source.grc
   DESTINATION ${GR_PKG_DATA_DIR}/examples/metadata
-  COMPONENT "runtime_python"
 )
diff --git a/gr-blocks/examples/msg_passing/CMakeLists.txt b/gr-blocks/examples/msg_passing/CMakeLists.txt
index 9c24355f7f..9965ce878a 100644
--- a/gr-blocks/examples/msg_passing/CMakeLists.txt
+++ b/gr-blocks/examples/msg_passing/CMakeLists.txt
@@ -23,5 +23,4 @@ install(
   FILES
   strobe.grc
   DESTINATION ${GR_PKG_DATA_DIR}/examples/msg_passing
-  COMPONENT "runtime_python"
 )
diff --git a/gr-blocks/examples/tags/CMakeLists.txt b/gr-blocks/examples/tags/CMakeLists.txt
index 142b5cde6c..52cf4662bb 100644
--- a/gr-blocks/examples/tags/CMakeLists.txt
+++ b/gr-blocks/examples/tags/CMakeLists.txt
@@ -22,6 +22,4 @@ include(GrPython)
 GR_PYTHON_INSTALL(PROGRAMS
   test_file_tags.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/tags
-  COMPONENT "blocks_python"
 )
-
diff --git a/gr-blocks/grc/CMakeLists.txt b/gr-blocks/grc/CMakeLists.txt
index 96a715a7e4..2dd1481a47 100644
--- a/gr-blocks/grc/CMakeLists.txt
+++ b/gr-blocks/grc/CMakeLists.txt
@@ -28,4 +28,4 @@ if(NOT ENABLE_GR_CTRLPORT)
     )
 endif(NOT ENABLE_GR_CTRLPORT)
 
-install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "blocks_python")
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR})
diff --git a/gr-blocks/include/gnuradio/blocks/CMakeLists.txt b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt
index 6b3eca69d3..5a748acc19 100644
--- a/gr-blocks/include/gnuradio/blocks/CMakeLists.txt
+++ b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt
@@ -192,7 +192,6 @@ install(FILES
     wavfile_sink.h
     wavfile_source.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/blocks
-    COMPONENT "blocks_devel"
 )
 
 if(ENABLE_GR_CTRLPORT)
@@ -204,6 +203,5 @@ install(FILES
   ctrlport_probe2_i.h
   ctrlport_probe2_b.h
   DESTINATION ${GR_INCLUDE_DIR}/gnuradio/blocks
-  COMPONENT "blocks_devel"
 )
 endif(ENABLE_GR_CTRLPORT)
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 1d69f27a1d..da6bc9bf89 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -259,7 +259,7 @@ add_library(gnuradio-blocks SHARED ${gr_blocks_sources})
 add_dependencies(gnuradio-blocks blocks_generated_includes)
 
 target_link_libraries(gnuradio-blocks ${blocks_libs})
-GR_LIBRARY_FOO(gnuradio-blocks RUNTIME_COMPONENT "blocks_runtime" DEVEL_COMPONENT "blocks_devel")
+GR_LIBRARY_FOO(gnuradio-blocks)
 
 if(ENABLE_STATIC_LIBS)
   # Remove controlport-specific source files from staticlibs build
@@ -290,7 +290,7 @@ if(ENABLE_STATIC_LIBS)
   endif(NOT WIN32)
 
   install(TARGETS gnuradio-blocks_static
-    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "blocks_devel"   # .lib file
+    ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
     )
 endif(ENABLE_STATIC_LIBS)
 
diff --git a/gr-blocks/python/blocks/CMakeLists.txt b/gr-blocks/python/blocks/CMakeLists.txt
index 19d808b1dd..afb860a075 100644
--- a/gr-blocks/python/blocks/CMakeLists.txt
+++ b/gr-blocks/python/blocks/CMakeLists.txt
@@ -26,7 +26,6 @@ GR_PYTHON_INSTALL(
     parse_file_metadata.py
     stream_to_vector_decimator.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/blocks
-    COMPONENT "blocks_python"
 )
 
 ########################################################################
diff --git a/gr-blocks/python/grc_gnuradio/CMakeLists.txt b/gr-blocks/python/grc_gnuradio/CMakeLists.txt
index 9ff1240997..33c7560ea6 100644
--- a/gr-blocks/python/grc_gnuradio/CMakeLists.txt
+++ b/gr-blocks/python/grc_gnuradio/CMakeLists.txt
@@ -24,7 +24,6 @@ include(GrPython)
 GR_PYTHON_INSTALL(
     FILES __init__.py
     DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio
-    COMPONENT "blocks_python"
 )
 
 GR_PYTHON_INSTALL(FILES
@@ -33,5 +32,4 @@ GR_PYTHON_INSTALL(FILES
     blks2/selector.py
     blks2/tcp.py
     DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/blks2
-    COMPONENT "blocks_python"
 )
diff --git a/gr-blocks/swig/CMakeLists.txt b/gr-blocks/swig/CMakeLists.txt
index c128a9b26c..5aec00ae92 100644
--- a/gr-blocks/swig/CMakeLists.txt
+++ b/gr-blocks/swig/CMakeLists.txt
@@ -68,8 +68,7 @@ foreach(swigfile ${GR_SWIG_BLOCK_IFILES})
   GR_SWIG_INSTALL(
     TARGETS ${swigfile}
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/blocks
-    COMPONENT "blocks_python")
-
+  )
   list(APPEND SWIGFILES ${swigfile}.i)
   list(APPEND SWIGDOCFILES ${CMAKE_CURRENT_BINARY_DIR}/${swigfile}_doc.i)
 endforeach(swigfile)
@@ -79,12 +78,10 @@ install(
     ${SWIGFILES}
     ${SWIGDOCFILES}
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-    COMPONENT "blocks_swig"
 )
 
 # Install the Python file that pulls in the swig built files.
 GR_PYTHON_INSTALL(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/blocks_swig.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/blocks
-    COMPONENT "blocks_python"
 )