diff options
| author | Seth Hitefield <sdhitefield@gmail.com> | 2017-07-27 13:06:53 -0400 |
|---|---|---|
| committer | Seth Hitefield <sdhitefield@gmail.com> | 2017-07-28 10:47:47 -0400 |
| commit | 26ddf9a6597eb92d7be7673430f6f2915a60c7dd (patch) | |
| tree | 9f46ed7ca71f38380b89c7507ad69dcf91784452 | |
| parent | e776f1e7196a7543de240b88005b26a02a4c87af (diff) | |
grc: Fixed missing files in cmake
| -rw-r--r-- | grc/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | grc/scripts/gnuradio-companion | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index d0002325b6..77c8d4c00d 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -149,11 +149,11 @@ GR_PYTHON_INSTALL( ) GR_PYTHON_INSTALL( - DIRECTORY core gui + DIRECTORY core gui converter DESTINATION "${GR_PYTHON_DIR}/gnuradio/grc" - FILES_MATCHING REGEX "\\.(py|dtd|grc|tmpl|png)$" + FILES_MATCHING REGEX "\\.(py|dtd|grc|tmpl|png|mako)$" ) - + ######################################################################## # Append NSIS commands to set environment variables ######################################################################## diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion index de776f22a7..55e66cc761 100755 --- a/grc/scripts/gnuradio-companion +++ b/grc/scripts/gnuradio-companion @@ -81,11 +81,6 @@ 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" @@ -103,6 +98,5 @@ def run_main(): if __name__ == '__main__': check_gnuradio_import() check_gtk() - check_python_version() check_blocks_path() run_main() |