From fb42db88833ee6804197a45260631f5af47338d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20W=C3=BCrl?= Date: Sun, 30 Aug 2020 20:09:19 +0200 Subject: [PATCH] CMake module: fix python 3.6 compatibility in path generation --- mesonbuild/cmake/interpreter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 8a7122d32..19441f909 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -433,8 +433,8 @@ class ConverterTarget: x = os.path.normpath(os.path.join(self.src_dir, x)) if not os.path.exists(x) and not any([x.endswith(y) for y in obj_suffixes]) and not is_generated: if ( - any([os.path.commonpath([x, y]) == x for y in self.generated]) - and os.path.isabs(x) + os.path.isabs(x) + and any([(os.path.isabs(y) and os.path.commonpath([x, y]) == x) for y in self.generated]) and os.path.commonpath([x, self.env.get_build_dir()]) == self.env.get_build_dir() ): os.makedirs(x)