diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-02-23 11:58:23 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-06 18:27:02 +0200 |
| commit | 316f4f49485ed51e29942364f11692638d47cfc1 (patch) | |
| tree | ad434abd1910c1279817ad4129ee3a01052c5c0b | |
| parent | bf81aac465bbfe9545393c18328804776defa0e0 (diff) | |
| download | meson-316f4f49485ed51e29942364f11692638d47cfc1.zip meson-316f4f49485ed51e29942364f11692638d47cfc1.tar.gz meson-316f4f49485ed51e29942364f11692638d47cfc1.tar.bz2 | |
cmake: Always add the CMake build dir to the include dirs
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index e070a68..ae42ae7 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -58,6 +58,7 @@ class ConverterTarget: def __init__(self, target: CMakeTarget): self.artifacts = target.artifacts self.src_dir = target.src_dir + self.build_dir = target.build_dir self.name = target.name self.full_name = target.full_name self.type = target.type @@ -146,7 +147,7 @@ class ConverterTarget: return os.path.relpath(x, root_src_dir) return x - self.includes = [rel_path(x) for x in self.includes] + self.includes = [rel_path(x) for x in set(self.includes + [self.build_dir])] self.sources = [rel_path(x) for x in self.sources] self.generated = [rel_path(x) for x in self.generated] |