diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-11-03 17:26:09 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-11-03 17:26:09 +0200 |
| commit | fa9799a96a98c593c97ca3218fa4d5c37c502124 (patch) | |
| tree | bb79b45aa4a356443aa741bc702aa804904fc6f5 | |
| parent | 8495075ceeb7c2d12589a9226d74e19f5cfc7e9b (diff) | |
| download | meson-fa9799a96a98c593c97ca3218fa4d5c37c502124.zip meson-fa9799a96a98c593c97ca3218fa4d5c37c502124.tar.gz meson-fa9799a96a98c593c97ca3218fa4d5c37c502124.tar.bz2 | |
Renamed default_library to library.
| -rw-r--r-- | interpreter.py | 6 | ||||
| -rw-r--r-- | test cases/common/96 default library/meson.build | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/interpreter.py b/interpreter.py index fb35f43..7d066f7 100644 --- a/interpreter.py +++ b/interpreter.py @@ -933,7 +933,7 @@ class Interpreter(): 'dependency' : self.func_dependency, 'static_library' : self.func_static_lib, 'shared_library' : self.func_shared_lib, - 'default_library' : self.func_default_library, + 'library' : self.func_library, 'jar' : self.func_jar, 'build_target': self.func_build_target, 'custom_target' : self.func_custom_target, @@ -1569,7 +1569,7 @@ class Interpreter(): def func_shared_lib(self, node, args, kwargs): return self.build_target(node, args, kwargs, SharedLibraryHolder) - def func_default_library(self, node, args, kwargs): + def func_library(self, node, args, kwargs): if self.coredata.get_builtin_option('default_library') == 'shared': return self.func_shared_lib(node, args, kwargs) return self.func_static_lib(node, args, kwargs) @@ -1587,6 +1587,8 @@ class Interpreter(): return self.func_shared_lib(node, args, kwargs) elif target_type == 'static_library': return self.func_static_lib(node, args, kwargs) + elif target_type == 'library': + return self.func_library(node, args, kwargs) elif target_type == 'jar': return self.func_jar(node, args, kwargs) else: diff --git a/test cases/common/96 default library/meson.build b/test cases/common/96 default library/meson.build index 15f4204..903cfe4 100644 --- a/test cases/common/96 default library/meson.build +++ b/test cases/common/96 default library/meson.build @@ -1,5 +1,5 @@ project('default library', 'cpp') -flib = default_library('ef', 'ef.cpp') +flib = library('ef', 'ef.cpp') exe = executable('eftest', 'eftest.cpp', link_with : flib) test('eftest', exe) |