diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-10 05:45:12 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-10 05:45:12 -0700 |
| commit | e4f0319eced22c112f7e6a4cc45bc2036d285332 (patch) | |
| tree | 92baa4254f47fd0b62d1d3f69e3b1ddb96dd32d3 /gr-utils/python | |
| parent | 5fd6b62702369e45ef01a02e12bec1afc5b57200 (diff) | |
| parent | 3e052d303874a07237c4e0c31eef3f7f7a192835 (diff) | |
Merged in 'next' branch.
Diffstat (limited to 'gr-utils/python')
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | gr-utils/python/modtool/util_functions.py | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt index 33f67c0442..6f01385e84 100644 --- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt +++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt @@ -86,10 +86,17 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks) find_package(GnuradioRuntime) find_package(CppUnit) +# To run a more advanced search for GNU Radio and it's components and +# versions, use the following. Add any components required to the list +# of GR_REQUIRED_COMPONENTS (in all caps) and change "version" to the +# minimum API compatible version required. +# +# set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS FILTER ...) +# find_package(Gnuradio "version") + if(NOT GNURADIO_RUNTIME_FOUND) message(FATAL_ERROR "GnuRadio Runtime required to compile howto") endif() - if(NOT CPPUNIT_FOUND) message(FATAL_ERROR "CppUnit required to compile howto") endif() diff --git a/gr-utils/python/modtool/util_functions.py b/gr-utils/python/modtool/util_functions.py index 4ca294ac31..c40dbd73bb 100644 --- a/gr-utils/python/modtool/util_functions.py +++ b/gr-utils/python/modtool/util_functions.py @@ -92,7 +92,7 @@ def get_modname(): pass # OK, there's no gnuradio.project. So, we need to guess. cmfile = open('CMakeLists.txt', 'r').read() - regexp = r'(project\s*\(\s*|GR_REGISTER_COMPONENT\(")gr-(?P<modname>[a-zA-Z1-9-_]+)(\s*(CXX)?|" ENABLE)' + regexp = r'(project\s*\(\s*|GR_REGISTER_COMPONENT\(")gr-(?P<modname>[a-zA-Z0-9-_]+)(\s*(CXX)?|" ENABLE)' try: modname = re.search(regexp, cmfile, flags=re.MULTILINE).group('modname').strip() if modname in modname_trans.keys(): |