diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-07-02 20:37:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-02 20:37:59 +0300 |
| commit | 1c44afdeed636f90a1e2685cba4143eacde21887 (patch) | |
| tree | fae2555335f85911e811a719fc125b4ff1de9b03 /mesonbuild/modules/pkgconfig.py | |
| parent | 1ec3c790567d230e994500a6edb44a26c2d64968 (diff) | |
| parent | cc58fdac33fad6f9af328b2bdc26fcd5c0274b84 (diff) | |
| download | meson-1c44afdeed636f90a1e2685cba4143eacde21887.zip meson-1c44afdeed636f90a1e2685cba4143eacde21887.tar.gz meson-1c44afdeed636f90a1e2685cba4143eacde21887.tar.bz2 | |
Merge pull request #3823 from mesonbuild/nirbheek/fix-featurenew-subprojects
Nirbheek/fix featurenew subprojects
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 63d1109..8684864 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -313,14 +313,14 @@ class PkgConfigModule(ExtensionModule): 'install_dir', 'extra_cflags', 'variables', 'url', 'd_module_versions'}) def generate(self, state, args, kwargs): if 'variables' in kwargs: - FeatureNew('custom pkgconfig variables', '0.41.0').use() + FeatureNew('custom pkgconfig variables', '0.41.0').use(state.subproject) default_version = state.project_version['version'] default_install_dir = None default_description = None default_name = None mainlib = None if len(args) == 1: - FeatureNew('pkgconfig.generate optional positional argument', '0.46.0').use() + FeatureNew('pkgconfig.generate optional positional argument', '0.46.0').use(state.subproject) mainlib = getattr(args[0], 'held_object', args[0]) if not isinstance(mainlib, (build.StaticLibrary, build.SharedLibrary)): raise mesonlib.MesonException('Pkgconfig_gen first positional argument must be a library object') |