Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmake: fix detecting directories as input files (fixes #10244)

This commit is contained in:
Daniel Mensinger 2022-04-23 13:56:24 +02:00 committed by Eli Schwartz
parent 7ef73e8f6a
commit ac31eb49d6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mesonbuild/cmake/interpreter.py
View File

@ -714,7 +714,7 @@ class ConverterCustomTarget:
# targets, etc. This reduces the chance of misdetecting input files # targets, etc. This reduces the chance of misdetecting input files
# as outputs from other targets. # as outputs from other targets.
# See https://github.com/mesonbuild/meson/issues/6632 # See https://github.com/mesonbuild/meson/issues/6632
if not raw.is_absolute() and (self.current_src_dir / raw).exists(): if not raw.is_absolute() and (self.current_src_dir / raw).is_file():
self.inputs += [(self.current_src_dir / raw).relative_to(root_src_dir).as_posix()] self.inputs += [(self.current_src_dir / raw).relative_to(root_src_dir).as_posix()]
elif raw.is_absolute() and raw.exists() and rel_to_root is not None: elif raw.is_absolute() and raw.exists() and rel_to_root is not None:
self.inputs += [rel_to_root.as_posix()] self.inputs += [rel_to_root.as_posix()]