10 files changed, 2 insertions, 59 deletions
diff --git a/gr-uhd/CMakeLists.txt b/gr-uhd/CMakeLists.txt
index 43ac4ab8a9..6310822cf4 100644
--- a/gr-uhd/CMakeLists.txt
+++ b/gr-uhd/CMakeLists.txt
@@ -50,47 +50,6 @@ SET(GR_PKG_UHD_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/uhd)
 if(ENABLE_GR_UHD)
 
 ########################################################################
-# Setup CPack components
-########################################################################
-include(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_UHD_DESCRIPTION "GNU Radio UHD Blocks")
-
-CPACK_COMPONENT("uhd_runtime"
-    GROUP        "UHD"
-    DISPLAY_NAME "Runtime"
-    DESCRIPTION  "Runtime"
-    DEPENDS      "runtime_runtime"
-)
-
-CPACK_COMPONENT("uhd_devel"
-    GROUP        "UHD"
-    DISPLAY_NAME "Development"
-    DESCRIPTION  "C++ headers, package config, import libraries"
-    DEPENDS      "runtime_devel"
-)
-
-CPACK_COMPONENT("uhd_python"
-    GROUP        "UHD"
-    DISPLAY_NAME "Python"
-    DESCRIPTION  "Python modules for runtime; GRC xml files"
-    DEPENDS      "runtime_python;uhd_runtime"
-)
-
-CPACK_COMPONENT("uhd_examples"
-    GROUP        "UHD"
-    DISPLAY_NAME "Examples"
-    DESCRIPTION  "Example programs"
-    DEPENDS      "uhd_runtime"
-)
-
-CPACK_COMPONENT("uhd_swig"
-    GROUP        "UHD"
-    DISPLAY_NAME "SWIG"
-    DESCRIPTION  "SWIG development .i files"
-    DEPENDS      "runtime_swig;uhd_python;uhd_devel"
-)
-
-########################################################################
 # Add subdirectories
 ########################################################################
 add_subdirectory(include/gnuradio/uhd)
@@ -117,7 +76,6 @@ configure_file(
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc
     DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
-    COMPONENT "uhd_devel"
 )
 
 endif(ENABLE_GR_UHD)
diff --git a/gr-uhd/apps/CMakeLists.txt b/gr-uhd/apps/CMakeLists.txt
index ebcaf6e9f8..ce94a43cff 100644
--- a/gr-uhd/apps/CMakeLists.txt
+++ b/gr-uhd/apps/CMakeLists.txt
@@ -27,7 +27,6 @@ GR_PYTHON_INSTALL(
     uhd_siggen_base.py
     uhd_app.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/uhd
-    COMPONENT "uhd_python"
 )
 
 GR_PYTHON_INSTALL(
@@ -38,7 +37,6 @@ GR_PYTHON_INSTALL(
     uhd_siggen_gui
     uhd_rx_nogui
     DESTINATION ${GR_RUNTIME_DIR}
-    COMPONENT "uhd_python"
 )
 
 ########################################################################
@@ -51,7 +49,6 @@ install(
     hf_radio/README.TXT
     hf_radio/ssb_taps
     DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio
-    COMPONENT "uhd_python"
 )
 
 GR_PYTHON_INSTALL(
@@ -62,7 +59,6 @@ GR_PYTHON_INSTALL(
     hf_radio/ssbdemod.py
     hf_radio/startup.py
     DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio
-    COMPONENT "uhd_python"
 )
 
 GR_PYTHON_INSTALL(
@@ -70,7 +66,6 @@ GR_PYTHON_INSTALL(
     hf_radio/radio.py
     hf_radio/ui.py
     DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio
-    COMPONENT "uhd_python"
 )
 
 ########################################################################
@@ -81,12 +76,10 @@ install(
     hf_explorer/README
     hf_explorer/hfx_help
     DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_explorer
-    COMPONENT "uhd_python"
 )
 
 GR_PYTHON_INSTALL(
     PROGRAMS
     hf_explorer/hfx.py
     DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_explorer
-    COMPONENT "uhd_python"
 )
diff --git a/gr-uhd/examples/c++/CMakeLists.txt b/gr-uhd/examples/c++/CMakeLists.txt
index 655ef0c0a9..c5a55520f6 100644
--- a/gr-uhd/examples/c++/CMakeLists.txt
+++ b/gr-uhd/examples/c++/CMakeLists.txt
@@ -40,5 +40,4 @@ target_link_libraries(tags_demo gnuradio-uhd)
 INSTALL(TARGETS
     tags_demo
     DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR}
-    COMPONENT "uhd_examples"
 )
diff --git a/gr-uhd/examples/grc/CMakeLists.txt b/gr-uhd/examples/grc/CMakeLists.txt
index 06c233d45c..4c124b5c03 100644
--- a/gr-uhd/examples/grc/CMakeLists.txt
+++ b/gr-uhd/examples/grc/CMakeLists.txt
@@ -27,5 +27,4 @@ install(
     uhd_tx_dpsk.grc
     uhd_wbfm_receive.grc
     DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR}
-    COMPONENT "uhd_python"
 )
diff --git a/gr-uhd/examples/python/CMakeLists.txt b/gr-uhd/examples/python/CMakeLists.txt
index 7642b536b8..cf50feb148 100644
--- a/gr-uhd/examples/python/CMakeLists.txt
+++ b/gr-uhd/examples/python/CMakeLists.txt
@@ -38,5 +38,4 @@ GR_PYTHON_INSTALL(
     usrp_wfm_rcv_sca.py
     usrp_wxapt_rcv.py
     DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR}
-    COMPONENT "uhd_python"
 )
diff --git a/gr-uhd/grc/CMakeLists.txt b/gr-uhd/grc/CMakeLists.txt
index 2d8f24aa3c..d748bfacef 100644
--- a/gr-uhd/grc/CMakeLists.txt
+++ b/gr-uhd/grc/CMakeLists.txt
@@ -42,5 +42,4 @@ install(FILES
     uhd_amsg_source.xml
     uhd_block_tree.xml
     DESTINATION ${GRC_BLOCKS_DIR}
-    COMPONENT "uhd_python"
 )
diff --git a/gr-uhd/include/gnuradio/uhd/CMakeLists.txt b/gr-uhd/include/gnuradio/uhd/CMakeLists.txt
index b1f3345d78..8d75afc1bc 100644
--- a/gr-uhd/include/gnuradio/uhd/CMakeLists.txt
+++ b/gr-uhd/include/gnuradio/uhd/CMakeLists.txt
@@ -27,5 +27,4 @@ install(FILES
     usrp_sink.h
     amsg_source.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/uhd
-    COMPONENT "uhd_devel"
 )
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt
index b57b80b557..2427516c9a 100644
--- a/gr-uhd/lib/CMakeLists.txt
+++ b/gr-uhd/lib/CMakeLists.txt
@@ -75,7 +75,7 @@ list(APPEND uhd_libs
 
 add_library(gnuradio-uhd SHARED ${gr_uhd_sources})
 target_link_libraries(gnuradio-uhd ${uhd_libs})
-GR_LIBRARY_FOO(gnuradio-uhd RUNTIME_COMPONENT "uhd_runtime" DEVEL_COMPONENT "uhd_devel")
+GR_LIBRARY_FOO(gnuradio-uhd)
 
 ########################################################################
 # Build static libraries if enabled
@@ -91,7 +91,7 @@ if(ENABLE_STATIC_LIBS)
     endif(NOT WIN32)
 
     install(TARGETS gnuradio-uhd_static
-      ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "uhd_devel"   # .lib file
+      ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
     )
   else(UHD_VERSION VERSION_GREATER "3.8.1")
     message(STATUS "Not building gr-uhd static library; requires UHD >= 3.8.2")
diff --git a/gr-uhd/python/uhd/CMakeLists.txt b/gr-uhd/python/uhd/CMakeLists.txt
index aa1d1a6b4a..ee69e8eb7d 100644
--- a/gr-uhd/python/uhd/CMakeLists.txt
+++ b/gr-uhd/python/uhd/CMakeLists.txt
@@ -26,7 +26,6 @@ GR_PYTHON_INSTALL(
     FILES
     __init__.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/uhd
-    COMPONENT "uhd_python"
 )
 
 ########################################################################
diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt
index ef54761d0f..5cbc6c642c 100644
--- a/gr-uhd/swig/CMakeLists.txt
+++ b/gr-uhd/swig/CMakeLists.txt
@@ -48,12 +48,10 @@ GR_SWIG_MAKE(uhd_swig uhd_swig.i)
 GR_SWIG_INSTALL(
     TARGETS uhd_swig
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/uhd
-    COMPONENT "uhd_python"
 )
 
 install(
     FILES uhd_swig.i
     ${CMAKE_CURRENT_BINARY_DIR}/uhd_swig_doc.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-    COMPONENT "uhd_swig"
 )