diff options
| author | Bruce Richardson <bruce.richardson@intel.com> | 2017-06-26 17:15:24 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-29 11:03:20 -0400 |
| commit | f12ece4547f7882027e7ebd916a5e5de13129ce8 (patch) | |
| tree | 17142898f92459d21c884e1f8d805decc6250bfc /mesonbuild/modules/pkgconfig.py | |
| parent | ba3871985a145ccd5aa92317cfd26b08966e8d6f (diff) | |
| download | meson-f12ece4547f7882027e7ebd916a5e5de13129ce8.zip meson-f12ece4547f7882027e7ebd916a5e5de13129ce8.tar.gz meson-f12ece4547f7882027e7ebd916a5e5de13129ce8.tar.bz2 | |
pkgconfig: add support for extra_cflags
Allow the user to pass in arbitrary cflags for putting into the generated
pkgconfig file.
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 7b0bb83..2dfdbc0 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -44,7 +44,7 @@ class PkgConfigModule(ExtensionModule): def generate_pkgconfig_file(self, state, libraries, subdirs, name, description, url, version, pcfile, pub_reqs, priv_reqs, - conflicts, priv_libs, variables): + conflicts, priv_libs, extra_cflags, variables): coredata = state.environment.get_coredata() outdir = state.environment.scratch_dir fname = os.path.join(outdir, pcfile) @@ -101,6 +101,9 @@ class PkgConfigModule(ExtensionModule): h = '' ofile.write(' ') ofile.write(os.path.join('-I${includedir}', h)) + for f in extra_cflags: + ofile.write(' ') + ofile.write(f) ofile.write('\n') def process_libs(self, libs): @@ -117,7 +120,7 @@ class PkgConfigModule(ExtensionModule): @permittedKwargs({'libraries', 'version', 'name', 'description', 'filebase', 'subdirs', 'requires', 'requires_private', 'libraries_private', - 'install_dir', 'variables'}) + 'install_dir', 'extra_cflags', 'variables'}) def generate(self, state, args, kwargs): if len(args) > 0: raise mesonlib.MesonException('Pkgconfig_gen takes no positional arguments.') @@ -142,6 +145,7 @@ class PkgConfigModule(ExtensionModule): pub_reqs = mesonlib.stringlistify(kwargs.get('requires', [])) priv_reqs = mesonlib.stringlistify(kwargs.get('requires_private', [])) conflicts = mesonlib.stringlistify(kwargs.get('conflicts', [])) + extra_cflags = mesonlib.stringlistify(kwargs.get('extra_cflags', [])) def parse_variable_list(stringlist): reserved = ['prefix', 'libdir', 'includedir'] @@ -177,7 +181,7 @@ class PkgConfigModule(ExtensionModule): raise mesonlib.MesonException('Install_dir must be a string.') self.generate_pkgconfig_file(state, libs, subdirs, name, description, url, version, pcfile, pub_reqs, priv_reqs, - conflicts, priv_libs, variables) + conflicts, priv_libs, extra_cflags, variables) res = build.Data(mesonlib.File(True, state.environment.get_scratch_dir(), pcfile), pkgroot) return ModuleReturnValue(res, [res]) |