diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-04 21:09:03 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-04 21:09:03 +0300 |
| commit | abebfe7927385bf4ac3766f3f004261b7a114eac (patch) | |
| tree | a82013eb9f262a6e19f0bd0747d8901b689be56a /tools | |
| parent | eef91d1b2f186cb9178f38daa2f8ba5776492dfa (diff) | |
| download | meson-abebfe7927385bf4ac3766f3f004261b7a114eac.tar.gz | |
More convertisizising.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/cmake2meson.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/tools/cmake2meson.py b/tools/cmake2meson.py index 248762e33..9fcaf744f 100755 --- a/tools/cmake2meson.py +++ b/tools/cmake2meson.py @@ -141,8 +141,14 @@ class Converter: self.indent_unit = ' ' self.indent_level = 0 - def convert_args(self, args): + def convert_args(self, args, as_array=True): res = [] + if as_array: + start = '[' + end = ']' + else: + start = '' + end = '' for i in args: if i.tid == 'id': res.append("'%s'" % i.value) @@ -154,7 +160,7 @@ class Converter: print(i) raise RuntimeError('Unknown arg type.') if len(res) > 1: - return '[' + ', '.join(res) + ']' + return start + ', '.join(res) + end if len(res) == 1: return res[0] return '' @@ -176,7 +182,9 @@ class Converter: else: line = '%s = [%s]' % (varname, ', '.join(["'%s'" % i for i in mods])) elif t.name == 'find_package': - line = '%s_dep = dependency(%s)' % (t.args[0].value, t.args[0].value) + line = "%s_dep = dependency('%s')" % (t.args[0].value, t.args[0].value) + elif t.name == 'find_library': + line = "%s = find_library('%s')" % (t.args[0].value.lower(), t.args[0].value) elif t.name == 'project': pname = t.args[0].value args = [pname] @@ -192,11 +200,11 @@ class Converter: line = '%s = %s\n' % (varname, self.convert_args(t.args[1:])) elif t.name == 'if': postincrement = 1 - line = 'if %s' % self.convert_args(t.args) + line = 'if %s' % self.convert_args(t.args, False) elif t.name == 'elseif': preincrement = -1 postincrement = 1 - line = 'elif %s' % self.convert_args(t.args) + line = 'elif %s' % self.convert_args(t.args, False) elif t.name == 'else': preincrement = -1 postincrement = 1 |