try IMPORTED_IMPLIB before IMPORTED_LOCATION for cmake dependencies

5 years ago · 748c9d817d
parent 4751f6d854
commit 748c9d817d
1 changed files with 5 additions and 1 deletions
--- 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']