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

Remove redundant backslash and fix white space issue

This commit is contained in:
Alf Henrik Sauge 2022-08-11 21:29:15 +02:00 committed by Eli Schwartz
parent 06bf9a5cda
commit 9ad5d0df4a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mesonbuild/dependencies/cmake.py
View File

@ -548,10 +548,11 @@ class CMakeDependency(ExternalDependency):
self.found_modules += [i] self.found_modules += [i]
rtgt = resolve_cmake_trace_targets(i, self.traceparser, self.env, rtgt = resolve_cmake_trace_targets(i, self.traceparser, self.env,
clib_compiler=self.clib_compiler, clib_compiler=self.clib_compiler,
not_found_warning=lambda x: mlog.warning('CMake: Dependency', mlog.bold(x), 'for', mlog.bold(name), 'was not found') not_found_warning=lambda x:
) mlog.warning('CMake: Dependency', mlog.bold(x), 'for', mlog.bold(name), 'was not found')
incDirs += rtgt.include_directories )
incDirs += rtgt.include_directories
compileOptions += rtgt.public_compile_opts compileOptions += rtgt.public_compile_opts
libraries += rtgt.libraries + rtgt.link_flags libraries += rtgt.libraries + rtgt.link_flags

2
mesonbuild/mcompile.py
View File

@ -125,7 +125,7 @@ def get_target_from_intro_data(target: ParsedTargetName, builddir: Path, introsp
t = i['type'].replace(' ', '_') t = i['type'].replace(' ', '_')
suggestions.append(f'- ./{p}:{t}') suggestions.append(f'- ./{p}:{t}')
suggestions_str = '\n'.join(suggestions) suggestions_str = '\n'.join(suggestions)
raise MesonException(f'Can\'t invoke target `{target.full_name}`: ambiguous name.' \ raise MesonException(f'Can\'t invoke target `{target.full_name}`: ambiguous name.'
f'Add target type and/or path:\n{suggestions_str}') f'Add target type and/or path:\n{suggestions_str}')
return found_targets[0] return found_targets[0]