diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-11-04 10:51:35 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-11-04 10:51:35 -0800 |
| commit | 0993c1b0ad518f66befca0c523c55ddc51a4eb91 (patch) | |
| tree | c2195c500c6d56e93031dec58d94bde9e1feae8d | |
| parent | 598e4b321708e4eedfd5e32bd910873e25ee3750 (diff) | |
| parent | 7c7ad1f2f6c20ba82faec966061be63234ef8ec7 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gr-wxgui/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | gr-wxgui/python/wxgui/CMakeLists.txt | 6 |
2 files changed, 25 insertions, 4 deletions
diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 0006160f8c..3d8b59c691 100644 --- 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 index 24e06acd5e..3a5cc11527 100644 --- 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" ) |