diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-12-09 20:52:54 +0100 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-12-10 20:00:14 +0200 |
commit | 38d3fbca9465e4c89e479be5a98b5085a7f83039 (patch) | |
tree | 14d65aee7b5ebe81e9f93612162f39b41b91cd88 /mesonbuild/dependencies/base.py | |
parent | 5da1a6e5867bda70fcdc371933b74fea6adc3f86 (diff) | |
download | meson-38d3fbca9465e4c89e479be5a98b5085a7f83039.zip meson-38d3fbca9465e4c89e479be5a98b5085a7f83039.tar.gz meson-38d3fbca9465e4c89e479be5a98b5085a7f83039.tar.bz2 |
dep: Try extraframework before cmake (fixes #6113)
Diffstat (limited to 'mesonbuild/dependencies/base.py')
-rw-r--r-- | mesonbuild/dependencies/base.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index cbc9f65..2abd243 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 |