aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-01-06 00:37:17 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2019-01-06 22:29:34 +0200
commit142cf1459fae41bb9cdfcc9dd445f61dc56db8c4 (patch)
treed745932e86d72dc9a544a347d16ff388abeb4275 /tools
parentaa840afb3ab5d5a7e05e5904e2380edff5876913 (diff)
downloadmeson-142cf1459fae41bb9cdfcc9dd445f61dc56db8c4.zip
meson-142cf1459fae41bb9cdfcc9dd445f61dc56db8c4.tar.gz
meson-142cf1459fae41bb9cdfcc9dd445f61dc56db8c4.tar.bz2
modernize library default syntax, be like CMake static default
Diffstat (limited to 'tools')
-rwxr-xr-xtools/cmake2meson.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/cmake2meson.py b/tools/cmake2meson.py
index 5fe433c..2c974fa 100755
--- a/tools/cmake2meson.py
+++ b/tools/cmake2meson.py
@@ -200,7 +200,7 @@ class Converter:
libcmd = 'static_library'
args = [t.args[0]] + t.args[2:]
else:
- libcmd = 'static_library'
+ libcmd = 'library'
args = t.args
line = '%s_lib = %s(%s)' % (t.args[0].value, libcmd, self.convert_args(args, False))
elif t.name == 'add_test':
@@ -223,7 +223,7 @@ class Converter:
l = 'cpp'
args.append(l)
args = ["'%s'" % i for i in args]
- line = 'project(' + ', '.join(args) + ')'
+ line = 'project(' + ', '.join(args) + ", default_options : ['default_library=static'])"
elif t.name == 'set':
varname = t.args[0].value.lower()
line = '%s = %s\n' % (varname, self.convert_args(t.args[1:]))