Remove redundant backslash and fix white space issue

pull/10746/head
Alf Henrik Sauge 2 years ago committed by Eli Schwartz
parent 06bf9a5cda
commit 9ad5d0df4a
  1. 9
      mesonbuild/dependencies/cmake.py
  2. 2
      mesonbuild/mcompile.py

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

@ -125,7 +125,7 @@ def get_target_from_intro_data(target: ParsedTargetName, builddir: Path, introsp
t = i['type'].replace(' ', '_')
suggestions.append(f'- ./{p}:{t}')
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}')
return found_targets[0]

Loading…
Cancel
Save