diff options
| author | Matthias Klumpp <matthias@tenstral.net> | 2017-09-12 17:27:14 +0200 |
|---|---|---|
| committer | Matthias Klumpp <matthias@tenstral.net> | 2017-09-12 17:33:22 +0200 |
| commit | 75fdf413e46b490c16eed834bd1c08e56bebe0f9 (patch) | |
| tree | 9b013b87d10adb30f61c41630f641f9cd035fee9 /mesonbuild/modules | |
| parent | 6cd3f066b4c4e9ffbe7c8af6a183a6ebe39925dc (diff) | |
| download | meson-75fdf413e46b490c16eed834bd1c08e56bebe0f9.zip meson-75fdf413e46b490c16eed834bd1c08e56bebe0f9.tar.gz meson-75fdf413e46b490c16eed834bd1c08e56bebe0f9.tar.bz2 | |
Drop feature_args call in favor of letting pkgconfig do this directly
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 0a0498c..594dd86 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -121,7 +121,7 @@ class PkgConfigModule(ExtensionModule): @permittedKwargs({'libraries', 'version', 'name', 'description', 'filebase', 'subdirs', 'requires', 'requires_private', 'libraries_private', - 'install_dir', 'extra_cflags', 'variables', 'url'}) + 'install_dir', 'extra_cflags', 'variables', 'url', 'd_feature_versions'}) def generate(self, state, args, kwargs): if len(args) > 0: raise mesonlib.MesonException('Pkgconfig_gen takes no positional arguments.') @@ -148,6 +148,12 @@ class PkgConfigModule(ExtensionModule): conflicts = mesonlib.stringlistify(kwargs.get('conflicts', [])) extra_cflags = mesonlib.stringlistify(kwargs.get('extra_cflags', [])) + dversions = kwargs.get('d_feature_versions', None) + if dversions: + compiler = state.environment.coredata.compilers.get('d') + if compiler: + extra_cflags.extend(compiler.get_feature_args({'versions': dversions})) + def parse_variable_list(stringlist): reserved = ['prefix', 'libdir', 'includedir'] variables = [] |