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

dep: Try extraframework before cmake (fixes #6113)

This commit is contained in:
Daniel Mensinger 2019-12-09 20:52:54 +01:00 committed by Jussi Pakkanen
parent 5da1a6e586
commit 38d3fbca94
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/dependencies/base.py
View File

@ -2294,13 +2294,15 @@ def _build_external_dependency_list(name, env: Environment, kwargs: Dict[str, An
# Otherwise, just use the pkgconfig and cmake dependency detector # Otherwise, just use the pkgconfig and cmake dependency detector
if 'auto' == kwargs.get('method', 'auto'): if 'auto' == kwargs.get('method', 'auto'):
candidates.append(functools.partial(PkgConfigDependency, name, env, kwargs)) candidates.append(functools.partial(PkgConfigDependency, name, env, kwargs))
candidates.append(functools.partial(CMakeDependency, name, env, kwargs))
# On OSX, also try framework dependency detector # On OSX, also try framework dependency detector
if mesonlib.is_osx(): if mesonlib.is_osx():
candidates.append(functools.partial(ExtraFrameworkDependency, name, candidates.append(functools.partial(ExtraFrameworkDependency, name,
False, None, env, None, kwargs)) False, None, env, None, kwargs))
# Only use CMake as a last resort, since it might not work 100% (see #6113)
candidates.append(functools.partial(CMakeDependency, name, env, kwargs))
return candidates return candidates