aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules
diff options
context:
space:
mode:
authorSalamandar <felix@piedallu.me>2018-04-27 16:23:55 +0200
committerSalamandar <felix@piedallu.me>2018-06-01 14:23:24 +0200
commitfa6550b277f26f5625c11b9c98902241a2901b41 (patch)
treebaf62d31b444eb96823f79d407e5bef8964d5d3d /mesonbuild/modules
parenta1a53e8de1454e94b57844ee187a637e6518edc5 (diff)
downloadmeson-fa6550b277f26f5625c11b9c98902241a2901b41.zip
meson-fa6550b277f26f5625c11b9c98902241a2901b41.tar.gz
meson-fa6550b277f26f5625c11b9c98902241a2901b41.tar.bz2
Add 0.40.0 features
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r--mesonbuild/modules/gnome.py3
-rw-r--r--mesonbuild/modules/qt.py3
2 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index d6f6a7b..d1c43bc 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -385,6 +385,7 @@ class GnomeModule(ExtensionModule):
ldflags = fixed_ldflags
return cflags, ldflags, gi_includes
+ @FeatureNewKwargs('build target', '0.40.0', ['build_by_default'])
@permittedKwargs({'sources', 'nsversion', 'namespace', 'symbol_prefix', 'identifier_prefix',
'export_packages', 'includes', 'dependencies', 'link_with', 'include_directories',
'install', 'install_dir_gir', 'install_dir_typelib', 'extra_args',
@@ -636,6 +637,7 @@ class GnomeModule(ExtensionModule):
rv = [scan_target, typelib_target]
return ModuleReturnValue(rv, rv)
+ @FeatureNewKwargs('build target', '0.40.0', ['build_by_default'])
@permittedKwargs({'build_by_default', 'depend_files'})
def compile_schemas(self, state, args, kwargs):
if args:
@@ -877,6 +879,7 @@ This will become a hard error in the future.''')
return []
+ @FeatureNewKwargs('build target', '0.40.0', ['build_by_default'])
@permittedKwargs({'interface_prefix', 'namespace', 'object_manager', 'build_by_default',
'annotations', 'docbook', 'install_header', 'install_dir', 'sources'})
def gdbus_codegen(self, state, args, kwargs):
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
index 39c65ed..f8d43a7 100644
--- a/mesonbuild/modules/qt.py
+++ b/mesonbuild/modules/qt.py
@@ -19,7 +19,7 @@ from ..mesonlib import MesonException, Popen_safe, extract_as_list, File
from ..dependencies import Qt4Dependency, Qt5Dependency
import xml.etree.ElementTree as ET
from . import ModuleReturnValue, get_include_args
-from ..interpreterbase import permittedKwargs
+from ..interpreterbase import permittedKwargs, FeatureNewKwargs
_QT_DEPS_LUT = {
4: Qt4Dependency,
@@ -181,6 +181,7 @@ class QtBaseModule:
sources.append(moc_output)
return ModuleReturnValue(sources, sources)
+ @FeatureNewKwargs('build target', '0.40.0', ['build_by_default'])
@permittedKwargs({'ts_files', 'install', 'install_dir', 'build_by_default', 'method'})
def compile_translations(self, state, args, kwargs):
ts_files, install_dir = extract_as_list(kwargs, 'ts_files', 'install_dir', pop=True)