diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2021-10-05 09:33:27 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2021-11-01 12:24:25 -0700 |
commit | 68c1669ae6a7715b11e7e7859c659ce286d08890 (patch) | |
tree | 5353e834669f7edc1251634699bcfd6136f043c3 | |
parent | 6472f013a193c30038ce82d5c2d7155a2de49ad9 (diff) | |
download | meson-68c1669ae6a7715b11e7e7859c659ce286d08890.zip meson-68c1669ae6a7715b11e7e7859c659ce286d08890.tar.gz meson-68c1669ae6a7715b11e7e7859c659ce286d08890.tar.bz2 |
build: IncludeDirs extend `to_string_list` method to handle builddir
-rw-r--r-- | mesonbuild/build.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 6423a11..12e25c5 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -385,11 +385,19 @@ class IncludeDirs(HoldableObject): def get_extra_build_dirs(self) -> T.List[str]: return self.extra_build_dirs - def to_string_list(self, sourcedir: str) -> T.List[str]: - """Convert IncludeDirs object to a list of strings.""" + def to_string_list(self, sourcedir: str, builddir: T.Optional[str] = None) -> T.List[str]: + """Convert IncludeDirs object to a list of strings. + + :param sourcedir: The absolute source directory + :param builddir: The absolute build directory, option, buid dir will not + be added if this is unset + :returns: A list of strings (without compiler argument) + """ strlist: T.List[str] = [] for idir in self.incdirs: strlist.append(os.path.join(sourcedir, self.curdir, idir)) + if builddir: + strlist.append(os.path.join(builddir, self.curdir, idir)) return strlist class ExtractedObjects(HoldableObject): |