8 files changed, 3 insertions, 46 deletions
diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt
index e0be42a0a5..3be716d7ab 100644
--- a/gr-analog/CMakeLists.txt
+++ b/gr-analog/CMakeLists.txt
@@ -51,40 +51,6 @@ SET(GR_PKG_ANALOG_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/analog)
 if(ENABLE_GR_ANALOG)
 
 ########################################################################
-# Setup CPack components
-########################################################################
-include(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_ANALOG_DESCRIPTION "GNU Radio Analog Blocks")
-
-CPACK_COMPONENT("analog_runtime"
-    GROUP        "Analog"
-    DISPLAY_NAME "Runtime"
-    DESCRIPTION  "Dynamic link libraries"
-    DEPENDS      "runtime_runtime"
-)
-
-CPACK_COMPONENT("analog_devel"
-    GROUP        "Analog"
-    DISPLAY_NAME "Development"
-    DESCRIPTION  "C++ headers, package config, import libraries"
-    DEPENDS      "runtime_devel"
-)
-
-CPACK_COMPONENT("analog_python"
-    GROUP        "Analog"
-    DISPLAY_NAME "Python"
-    DESCRIPTION  "Python modules for runtime"
-    DEPENDS      "runtime_python;analog_runtime"
-)
-
-CPACK_COMPONENT("analog_swig"
-    GROUP        "Analog"
-    DISPLAY_NAME "SWIG"
-    DESCRIPTION  "SWIG development .i files"
-    DEPENDS      "runtime_swig;analog_python;analog_devel"
-)
-
-########################################################################
 # Add subdirectories
 ########################################################################
 add_subdirectory(include/gnuradio/analog)
@@ -109,7 +75,6 @@ configure_file(
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-analog.pc
     DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
-    COMPONENT "analog_devel"
 )
 
 endif(ENABLE_GR_ANALOG)
diff --git a/gr-analog/examples/CMakeLists.txt b/gr-analog/examples/CMakeLists.txt
index acb0656b7f..fb23bdf4a0 100644
--- a/gr-analog/examples/CMakeLists.txt
+++ b/gr-analog/examples/CMakeLists.txt
@@ -23,12 +23,10 @@ include(GrPython)
 GR_PYTHON_INSTALL(PROGRAMS
     fmtest.py
     DESTINATION ${GR_PKG_ANALOG_EXAMPLES_DIR}
-    COMPONENT "analog_python"
 )
 
 install(
     FILES
     noise_power.grc
     DESTINATION ${GR_PKG_ANALOG_EXAMPLES_DIR}
-    COMPONENT "analog_python"
 )
diff --git a/gr-analog/examples/tags/CMakeLists.txt b/gr-analog/examples/tags/CMakeLists.txt
index ba95100665..9e51cee16a 100644
--- a/gr-analog/examples/tags/CMakeLists.txt
+++ b/gr-analog/examples/tags/CMakeLists.txt
@@ -22,5 +22,4 @@ include(GrPython)
 GR_PYTHON_INSTALL(PROGRAMS
   uhd_burst_detector.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/tags
-  COMPONENT "runtime_python"
 )
diff --git a/gr-analog/grc/CMakeLists.txt b/gr-analog/grc/CMakeLists.txt
index a699d7c2fa..1251af5b83 100644
--- a/gr-analog/grc/CMakeLists.txt
+++ b/gr-analog/grc/CMakeLists.txt
@@ -18,5 +18,4 @@
 # Boston, MA 02110-1301, USA.
 
 file(GLOB xml_files "*.xml")
-install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "analog_python")
-
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR})
diff --git a/gr-analog/include/gnuradio/analog/CMakeLists.txt b/gr-analog/include/gnuradio/analog/CMakeLists.txt
index b5333639d6..24b9ad95d1 100644
--- a/gr-analog/include/gnuradio/analog/CMakeLists.txt
+++ b/gr-analog/include/gnuradio/analog/CMakeLists.txt
@@ -68,6 +68,5 @@ install(FILES
     sig_source_waveform.h
     simple_squelch_cc.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/analog
-    COMPONENT "analog_devel"
 )
 
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
index a75d70337b..a3b279f900 100644
--- a/gr-analog/lib/CMakeLists.txt
+++ b/gr-analog/lib/CMakeLists.txt
@@ -106,7 +106,7 @@ list(APPEND analog_libs
 
 add_library(gnuradio-analog SHARED ${analog_sources})
 target_link_libraries(gnuradio-analog ${analog_libs})
-GR_LIBRARY_FOO(gnuradio-analog RUNTIME_COMPONENT "analog_runtime" DEVEL_COMPONENT "analog_devel")
+GR_LIBRARY_FOO(gnuradio-analog)
 add_dependencies(gnuradio-analog analog_generated_includes analog_generated_swigs gnuradio-filter)
 
 if(ENABLE_STATIC_LIBS)
@@ -122,7 +122,7 @@ if(ENABLE_STATIC_LIBS)
   endif(NOT WIN32)
 
   install(TARGETS gnuradio-analog_static
-    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "analog_devel"   # .lib file
+    ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
     )
 endif(ENABLE_STATIC_LIBS)
 
diff --git a/gr-analog/python/analog/CMakeLists.txt b/gr-analog/python/analog/CMakeLists.txt
index 2da8273c6c..1fed9d1890 100644
--- a/gr-analog/python/analog/CMakeLists.txt
+++ b/gr-analog/python/analog/CMakeLists.txt
@@ -36,7 +36,6 @@ GR_PYTHON_INSTALL(
     wfm_rcv_pll.py
     wfm_tx.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/analog
-    COMPONENT "analog_python"
 )
 
 ########################################################################
diff --git a/gr-analog/swig/CMakeLists.txt b/gr-analog/swig/CMakeLists.txt
index 38fef3a236..3636cce16d 100644
--- a/gr-analog/swig/CMakeLists.txt
+++ b/gr-analog/swig/CMakeLists.txt
@@ -50,7 +50,6 @@ GR_SWIG_MAKE(analog_swig analog_swig.i)
 GR_SWIG_INSTALL(
     TARGETS analog_swig
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/analog
-    COMPONENT "analog_python"
 )
 
 install(
@@ -58,5 +57,4 @@ install(
     analog_swig.i
     ${CMAKE_CURRENT_BINARY_DIR}/analog_swig_doc.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-    COMPONENT "analog_swig"
 )