diff options
| author | Norbert Nemec <Norbert@Nemec-online.de> | 2019-07-05 08:33:02 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-07-10 20:14:16 +0300 |
| commit | 748c9d817d8b6a0bb79eeba6256370db777754f4 (patch) | |
| tree | 0bf005bcee35cbaef6dd1389cd43cc42560f1063 | |
| parent | 4751f6d854a948c49dec3157d9e38b198f0e3ee8 (diff) | |
| download | meson-748c9d817d8b6a0bb79eeba6256370db777754f4.tar.gz | |
try IMPORTED_IMPLIB before IMPORTED_LOCATION for cmake dependencies
| -rw-r--r-- | mesonbuild/dependencies/base.py | 6 |
1 files changed, 5 insertions, 1 deletions
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'] |