diff options
| author | Sebastian Würl <s.wuerl@mailbox.org> | 2020-08-30 21:23:59 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-08-30 23:53:00 +0200 |
| commit | 6f3c8667ed91b9c62def2b2fed45a985a8de1890 (patch) | |
| tree | 73195a339ea3d580dc2f022acd2881f6a098713b /mesonbuild/cmake/interpreter.py | |
| parent | fb42db88833ee6804197a45260631f5af47338d4 (diff) | |
| download | meson-6f3c8667ed91b9c62def2b2fed45a985a8de1890.zip meson-6f3c8667ed91b9c62def2b2fed45a985a8de1890.tar.gz meson-6f3c8667ed91b9c62def2b2fed45a985a8de1890.tar.bz2 | |
CMake module: fix cmake 3.10 compatibility in path generation
Diffstat (limited to 'mesonbuild/cmake/interpreter.py')
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 19441f9..ef353e1 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -430,11 +430,11 @@ class ConverterTarget: # Make paths relative def rel_path(x: str, is_header: bool, is_generated: bool) -> T.Optional[str]: if not os.path.isabs(x): - x = os.path.normpath(os.path.join(self.src_dir, x)) + x = os.path.join(self.src_dir, x) + x = os.path.normpath(x) if not os.path.exists(x) and not any([x.endswith(y) for y in obj_suffixes]) and not is_generated: if ( - os.path.isabs(x) - and any([(os.path.isabs(y) and os.path.commonpath([x, y]) == x) for y in self.generated]) + any([os.path.commonpath([x, os.path.normpath(os.path.join(root_src_dir, 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) @@ -475,10 +475,10 @@ class ConverterTarget: return x build_dir_rel = os.path.relpath(self.build_dir, os.path.join(self.env.get_build_dir(), subdir)) + self.generated = [rel_path(x, False, True) for x in self.generated] self.includes = list(OrderedSet([rel_path(x, True, False) for x in OrderedSet(self.includes)] + [build_dir_rel])) self.sys_includes = list(OrderedSet([rel_path(x, True, False) for x in OrderedSet(self.sys_includes)])) self.sources = [rel_path(x, False, False) for x in self.sources] - self.generated = [rel_path(x, False, True) for x in self.generated] # Resolve custom targets self.generated = [custom_target(x) for x in self.generated] |