From 748c9d817d8b6a0bb79eeba6256370db777754f4 Mon Sep 17 00:00:00 2001 From: Norbert Nemec Date: Fri, 5 Jul 2019 08:33:02 +0200 Subject: [PATCH] try IMPORTED_IMPLIB before IMPORTED_LOCATION for cmake dependencies --- mesonbuild/dependencies/base.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index fdfd143e1..8616367b9 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1357,7 +1357,11 @@ class CMakeDependency(ExternalDependency): if 'RELEASE' in cfgs: cfg = 'RELEASE' - if 'IMPORTED_LOCATION_{}'.format(cfg) in tgt.properies: + if 'IMPORTED_IMPLIB_{}'.format(cfg) in tgt.properies: + libraries += tgt.properies['IMPORTED_IMPLIB_{}'.format(cfg)] + elif 'IMPORTED_IMPLIB' in tgt.properies: + libraries += tgt.properies['IMPORTED_IMPLIB'] + elif 'IMPORTED_LOCATION_{}'.format(cfg) in tgt.properies: libraries += tgt.properies['IMPORTED_LOCATION_{}'.format(cfg)] elif 'IMPORTED_LOCATION' in tgt.properies: libraries += tgt.properies['IMPORTED_LOCATION']