3 files changed, 33 insertions, 0 deletions
diff --git a/grc/gui/CMakeLists.txt b/grc/gui/CMakeLists.txt
index 12be4a8151..f4c624288a 100644
--- a/grc/gui/CMakeLists.txt
+++ b/grc/gui/CMakeLists.txt
@@ -23,3 +23,5 @@ GR_PYTHON_INSTALL(
     FILES ${py_files}
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/gui
 )
+
+add_subdirectory(canvas)
diff --git a/grc/gui/canvas/CMakeLists.txt b/grc/gui/canvas/CMakeLists.txt
new file mode 100644
index 0000000000..e24e8c2d56
--- /dev/null
+++ b/grc/gui/canvas/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Copyright 2016 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.
+
+file(GLOB py_files "*.py")
+
+GR_PYTHON_INSTALL(
+    FILES ${py_files}
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core/utils
+)
diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion
index c1ffdf28bc..c36837187c 100755
--- a/grc/scripts/gnuradio-companion
+++ b/grc/scripts/gnuradio-companion
@@ -80,6 +80,11 @@ def check_blocks_path():
             "Can't find block definitions. Use config.conf or GRC_BLOCKS_PATH.")
 
 
+def check_python_version():
+    if sys.version_info.major > 2:
+        die(RuntimeError('No python3 support yet.'), 'Stay tuned...')
+
+
 def run_main():
     script_path = os.path.dirname(os.path.abspath(__file__))
     source_tree_subpath = "/grc/scripts"
@@ -97,5 +102,6 @@ def run_main():
 if __name__ == '__main__':
     check_gnuradio_import()
     check_gtk()
+    check_python_version()
     check_blocks_path()
     run_main()