From 38d3fbca9465e4c89e479be5a98b5085a7f83039 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Mon, 9 Dec 2019 20:52:54 +0100 Subject: [PATCH] dep: Try extraframework before cmake (fixes #6113) --- mesonbuild/dependencies/base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index cbc9f65d1..2abd243ca 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -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 if 'auto' == kwargs.get('method', 'auto'): candidates.append(functools.partial(PkgConfigDependency, name, env, kwargs)) - candidates.append(functools.partial(CMakeDependency, name, env, kwargs)) # On OSX, also try framework dependency detector if mesonlib.is_osx(): candidates.append(functools.partial(ExtraFrameworkDependency, name, 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