wxgui: CPack fix

* CPack wasn't including most wxgui files in Windows packages * Making CPack component registration consistent with other modules fixes problem
bhilburn · Nov 4, 2013 · 7c7ad1f · 7c7ad1f
1 parent 2afe68f
commit 7c7ad1f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt
@@ -62,12 +62,33 @@ GR_SET_GLOBAL(GR_WXGUI_INCLUDE_DIRS
 # Setup CPack components
 ########################################################################
 include(GrPackage)
-CPACK_COMPONENT("wxgui"
+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
 ########################################################################

diff --git a/gr-wxgui/python/wxgui/CMakeLists.txt b/gr-wxgui/python/wxgui/CMakeLists.txt
@@ -55,7 +55,7 @@ GR_PYTHON_INSTALL(
     slider.py
     stdgui2.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui
-    COMPONENT "wxgui"
+    COMPONENT "wxgui_python"
 )
 
 ########################################################################
@@ -67,7 +67,7 @@ GR_PYTHON_INSTALL(
     forms/forms.py
     forms/converters.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui/forms
-    COMPONENT "wxgui"
+    COMPONENT "wxgui_python"
 )
 
 ########################################################################
@@ -84,5 +84,5 @@ GR_PYTHON_INSTALL(
     plotter/plotter_base.py
     plotter/waterfall_plotter.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui/plotter
-    COMPONENT "wxgui"
+    COMPONENT "wxgui_python"
 )