summaryrefslogtreecommitdiff
path: root/gr-utils/python/modtool/modtool_base.py
diff options
context:
space:
mode:
authorJiri Pinkava <j-pi@seznam.cz>2013-07-20 21:11:51 +0200
committerJiri Pinkava <j-pi@seznam.cz>2013-07-20 21:11:51 +0200
commitf338c66808d8b56f40c5c4dbb34c4d3c13ff8d24 (patch)
tree0b9d95089cfcdc95ce1622a7178e0d5bf8778cd6 /gr-utils/python/modtool/modtool_base.py
parent9bcf1feb9d73ff8cda72e9c0e6497d979b5471b3 (diff)
modtool: fix detection of GNU Radio module directory
Diffstat (limited to 'gr-utils/python/modtool/modtool_base.py')
-rw-r--r--gr-utils/python/modtool/modtool_base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/gr-utils/python/modtool/modtool_base.py b/gr-utils/python/modtool/modtool_base.py
index a03334bedc..081c10aaf9 100644
--- a/gr-utils/python/modtool/modtool_base.py
+++ b/gr-utils/python/modtool/modtool_base.py
@@ -131,7 +131,8 @@ class ModTool(object):
return False
for f in files:
if os.path.isfile(f) and f == 'CMakeLists.txt':
- if re.search('find_package\(GnuradioRuntime\)', open(f).read()) is not None:
+ if re.search('find_package\(GnuradioRuntime\)', open(f).read()) is not None or \
+ re.search('find_package\(Gnuradio(\s+[0-9".]+)?\)', open(f).read()) is not None:
self._info['version'] = '36' # Might be 37, check that later
has_makefile = True
elif re.search('GR_REGISTER_COMPONENT', open(f).read()) is not None: