aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-10-20 13:44:58 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2020-10-24 19:31:15 +0200
commit1eb9d8ad6e30fb5381e720f50dcda9965e19a399 (patch)
tree3b9929592ac9691bb46698f31e789b16242a4592
parente8399c8c6e237f82c194e0a917767c0dc5e92062 (diff)
downloadmeson-1eb9d8ad6e30fb5381e720f50dcda9965e19a399.zip
meson-1eb9d8ad6e30fb5381e720f50dcda9965e19a399.tar.gz
meson-1eb9d8ad6e30fb5381e720f50dcda9965e19a399.tar.bz2
cmake: Always create missing includes in build dir
There really isn't any reason to not always create missing include directories inside the build dir. Just restricting this to generate generated sources should work in an ideal world, however, there exists lots of suboptimal CMake code where this assumption is not always true.
-rw-r--r--mesonbuild/cmake/interpreter.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py
index bac9dad..e2f11a0 100644
--- a/mesonbuild/cmake/interpreter.py
+++ b/mesonbuild/cmake/interpreter.py
@@ -435,10 +435,7 @@ class ConverterTarget:
x = x.resolve()
assert x.is_absolute()
if not x.exists() and not any([x.name.endswith(y) for y in obj_suffixes]) and not is_generated:
- if (
- any([path_is_in_root(root_src_dir / y, x.resolve(), resolve=True) for y in self.generated_raw])
- and path_is_in_root(x, Path(self.env.get_build_dir()), resolve=True)
- ):
+ if path_is_in_root(x, Path(self.env.get_build_dir()), resolve=True):
x.mkdir(parents=True, exist_ok=True)
return x.relative_to(Path(self.env.get_build_dir()) / subdir)
else: