6 files changed, 3 insertions, 45 deletions
diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt
index 3d8b59c691..d77e36ad4a 100644
--- a/gr-wxgui/CMakeLists.txt
+++ b/gr-wxgui/CMakeLists.txt
@@ -59,37 +59,6 @@ GR_SET_GLOBAL(GR_WXGUI_INCLUDE_DIRS
 )
 
 ########################################################################
-# Setup CPack components
-########################################################################
-include(GrPackage)
-CPACK_COMPONENT("wxgui_runtime"
-    DISPLAY_NAME "WxGUI"
-    DESCRIPTION  "Wx GUI plotter widgets and grc wrappers"
-    DEPENDS      "runtime_python"
-)
-
-CPACK_COMPONENT("wxgui_devel"
-    GROUP        "WxGUI"
-    DISPLAY_NAME "Development"
-    DESCRIPTION  "C++ headers, package config, import libraries"
-    DEPENDS      "runtime_devel"
-)
-
-CPACK_COMPONENT("wxgui_python"
-    GROUP        "WxGUI"
-    DISPLAY_NAME "Python"
-    DESCRIPTION  "Python modules for runtime; GRC xml files"
-    DEPENDS      "runtime_python;wxgui_runtime"
-)
-
-CPACK_COMPONENT("wxgui_swig"
-    GROUP        "WxGUI"
-    DISPLAY_NAME "SWIG"
-    DESCRIPTION  "SWIG development .i files"
-    DEPENDS      "runtime_swig;wxgui_python;wxgui_devel"
-)
-
-########################################################################
 # Create Pkg Config File
 ########################################################################
 configure_file(
@@ -100,7 +69,6 @@ configure_file(
 install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc
     DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
-    COMPONENT "wxgui"
 )
 
 ########################################################################
@@ -109,7 +77,6 @@ install(
 install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf
     DESTINATION ${GR_PREFSDIR}
-    COMPONENT "wxgui"
 )
 
 ########################################################################
diff --git a/gr-wxgui/grc/CMakeLists.txt b/gr-wxgui/grc/CMakeLists.txt
index 9ee6e2370e..52c9bbda43 100644
--- a/gr-wxgui/grc/CMakeLists.txt
+++ b/gr-wxgui/grc/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 ########################################################################
 file(GLOB xml_files "*.xml")
-install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "wxgui_python")
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR})
 
 ########################################################################
 #The wxgui module contains a top_block + wxgui frame.
@@ -32,5 +32,4 @@ GR_PYTHON_INSTALL(
     panel.py
     top_block_gui.py
     DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/wxgui
-    COMPONENT "wxgui_python"
 )
diff --git a/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt b/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt
index fad84792e1..468d9b7992 100644
--- a/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt
+++ b/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt
@@ -28,5 +28,4 @@ install(FILES
     oscope_sink_x.h
     trigger_mode.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/wxgui
-    COMPONENT "wxgui_devel"
 )
diff --git a/gr-wxgui/lib/CMakeLists.txt b/gr-wxgui/lib/CMakeLists.txt
index d4c244177f..2f1f6135f3 100644
--- a/gr-wxgui/lib/CMakeLists.txt
+++ b/gr-wxgui/lib/CMakeLists.txt
@@ -71,9 +71,7 @@ list(APPEND wxgui_libs
 add_library(gnuradio-wxgui SHARED ${gr_wxgui_sources})
 
 target_link_libraries(gnuradio-wxgui ${wxgui_libs})
-GR_LIBRARY_FOO(gnuradio-wxgui
-  RUNTIME_COMPONENT "wxgui_runtime"
-  DEVEL_COMPONENT "wxgui_devel")
+GR_LIBRARY_FOO(gnuradio-wxgui)
 
 if(ENABLE_STATIC_LIBS)
   if(ENABLE_GR_CTRLPORT)
@@ -95,6 +93,6 @@ if(ENABLE_STATIC_LIBS)
   endif(NOT WIN32)
 
   install(TARGETS gnuradio-wxgui_static
-    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "wxgui_devel"   # .lib file
+    ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
     )
 endif(ENABLE_STATIC_LIBS)
diff --git a/gr-wxgui/python/wxgui/CMakeLists.txt b/gr-wxgui/python/wxgui/CMakeLists.txt
index 3a5cc11527..a06cba70b7 100644
--- a/gr-wxgui/python/wxgui/CMakeLists.txt
+++ b/gr-wxgui/python/wxgui/CMakeLists.txt
@@ -55,7 +55,6 @@ GR_PYTHON_INSTALL(
     slider.py
     stdgui2.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui
-    COMPONENT "wxgui_python"
 )
 
 ########################################################################
@@ -67,7 +66,6 @@ GR_PYTHON_INSTALL(
     forms/forms.py
     forms/converters.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui/forms
-    COMPONENT "wxgui_python"
 )
 
 ########################################################################
@@ -84,5 +82,4 @@ GR_PYTHON_INSTALL(
     plotter/plotter_base.py
     plotter/waterfall_plotter.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui/plotter
-    COMPONENT "wxgui_python"
 )
diff --git a/gr-wxgui/swig/CMakeLists.txt b/gr-wxgui/swig/CMakeLists.txt
index 034036e267..4eb11633a7 100644
--- a/gr-wxgui/swig/CMakeLists.txt
+++ b/gr-wxgui/swig/CMakeLists.txt
@@ -45,7 +45,6 @@ GR_SWIG_MAKE(wxgui_swig wxgui_swig.i)
 GR_SWIG_INSTALL(
     TARGETS wxgui_swig
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui
-    COMPONENT "wxgui_python"
 )
 
 install(
@@ -53,5 +52,4 @@ install(
     wxgui_swig.i
     ${CMAKE_CURRENT_BINARY_DIR}/wxgui_swig_doc.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-    COMPONENT "wxgui_swig"
 )