diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-09 14:03:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-09 14:03:15 -0500 |
commit | 9cf0991a1d332cb1f492376bf718aa75020519e4 (patch) | |
tree | e76619cd12c93c1520e70930e51486e04b033815 /mesonbuild/modules/pkgconfig.py | |
parent | 747d4f2b03d471efd01a6929dc4bd2c789b1c610 (diff) | |
parent | 340781c51574e5e407b45609f36d67018a14f94e (diff) | |
download | meson-9cf0991a1d332cb1f492376bf718aa75020519e4.zip meson-9cf0991a1d332cb1f492376bf718aa75020519e4.tar.gz meson-9cf0991a1d332cb1f492376bf718aa75020519e4.tar.bz2 |
Merge pull request #1278 from mesonbuild/newmodules
Bring some order to modules
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
-rw-r--r-- | mesonbuild/modules/pkgconfig.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index aaf0746..38358f3 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -15,6 +15,8 @@ from .. import build from .. import mesonlib from .. import mlog +from . import ModuleReturnValue + import os class PkgConfigModule: @@ -138,7 +140,8 @@ class PkgConfigModule: self.generate_pkgconfig_file(state, libs, subdirs, name, description, url, version, pcfile, pub_reqs, priv_reqs, conflicts, priv_libs) - return build.Data(mesonlib.File(True, state.environment.get_scratch_dir(), pcfile), pkgroot) + res = build.Data(mesonlib.File(True, state.environment.get_scratch_dir(), pcfile), pkgroot) + return ModuleReturnValue(res, [res]) def initialize(): return PkgConfigModule() |