[Commit-gnuradio] [gnuradio] 93/101: grc: gtk3: python3 error, some cmake fixes

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch python3
in repository gnuradio.

commit 2a5403ce818a9dfd72a3965e138c8d9fb035a1ac
Author: Sebastian Koslowski <address@hidden>
Date:   Sat Jan 7 20:04:19 2017 +0100

    grc: gtk3: python3 error, some cmake fixes
---
 grc/gui/CMakeLists.txt              | 2 ++
 grc/gui/{ => canvas}/CMakeLists.txt | 4 ++--
 grc/scripts/gnuradio-companion      | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/grc/gui/CMakeLists.txt b/grc/gui/CMakeLists.txt
index 12be4a8..f4c6242 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/CMakeLists.txt b/grc/gui/canvas/CMakeLists.txt
similarity index 88%
copy from grc/gui/CMakeLists.txt
copy to grc/gui/canvas/CMakeLists.txt
index 12be4a8..e24e8c2 100644
--- a/grc/gui/CMakeLists.txt
+++ b/grc/gui/canvas/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2016 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -21,5 +21,5 @@ file(GLOB py_files "*.py")
 
 GR_PYTHON_INSTALL(
     FILES ${py_files}
-    DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/gui
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/core/utils
 )
diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion
index c1ffdf2..c368371 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()