4 files changed, 110 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c175bdd77..6bd31dbe4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,6 +203,7 @@ add_subdirectory(gr-pager)
 add_subdirectory(gr-qtgui)
 add_subdirectory(gr-trellis)
 add_subdirectory(gr-uhd)
+add_subdirectory(gr-utils)
 add_subdirectory(gr-video-sdl)
 add_subdirectory(gr-vocoder)
 add_subdirectory(gr-wxgui)
diff --git a/gr-utils/CMakeLists.txt b/gr-utils/CMakeLists.txt
new file mode 100644
index 000000000..38bb245c6
--- /dev/null
+++ b/gr-utils/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# Setup dependencies
+########################################################################
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-utils" ENABLE_GR_UTILS
+    ENABLE_GR_CORE
+    ENABLE_PYTHON
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_UTILS)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_COMPONENT("utils"
+    DISPLAY_NAME "Utils"
+    DESCRIPTION  "Misc gnuradio python utilities"
+    DEPENDS      "core_python"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(src/python)
+
+endif(ENABLE_GR_UTILS)
diff --git a/gr-utils/src/python/CMakeLists.txt b/gr-utils/src/python/CMakeLists.txt
new file mode 100644
index 000000000..fba0d57a5
--- /dev/null
+++ b/gr-utils/src/python/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# Install python files and apps
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    FILES
+    plot_data.py
+    pyqt_plot.py
+    pyqt_filter.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio
+    COMPONENT "utils"
+)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    create-gnuradio-out-of-tree-project
+    gr_plot_char.py
+    gr_plot_const.py
+    gr_plot_fft.py
+    gr_plot_fft_c.py
+    gr_plot_fft_f.py
+    gr_plot_psd.py
+    gr_plot_psd_c.py
+    gr_plot_psd_f.py
+    gr_plot_float.py
+    gr_plot_int.py
+    gr_plot_iq.py
+    gr_plot_short.py
+    gr_plot_qt.py
+    gr_filter_design.py
+    DESTINATION ${GR_RUNTIME_DIR}
+    COMPONENT "utils"
+)
diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt
index 54fe4fb64..5beb39f5e 100644
--- a/gr-wxgui/CMakeLists.txt
+++ b/gr-wxgui/CMakeLists.txt
@@ -29,7 +29,7 @@ GR_PYTHON_CHECK_MODULE("numpy"      numpy        True
 # Register component
 ########################################################################
 include(GrComponent)
-GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_WXGUI
+GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_GR_WXGUI
     ENABLE_GR_CORE
     ENABLE_PYTHON
     NUMPY_FOUND
@@ -39,7 +39,7 @@ GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_WXGUI
 ########################################################################
 # Begin conditional configuration
 ########################################################################
-if(ENABLE_WXGUI)
+if(ENABLE_GR_WXGUI)
 
 ########################################################################
 # Setup CPack components
@@ -80,4 +80,4 @@ install(
 add_subdirectory(grc)
 add_subdirectory(src/python)
 
-endif(ENABLE_WXGUI)
+endif(ENABLE_GR_WXGUI)