Chiebot-Mirror
/
meson
mirror of https://github.com/mesonbuild/meson.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

try IMPORTED_IMPLIB before IMPORTED_LOCATION for cmake dependencies

Browse Source
pull/5633/head
Norbert Nemec 5 years ago committed by Jussi Pakkanen
parent 4751f6d854
commit 748c9d817d
1 changed files with 5 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      mesonbuild/dependencies/base.py

6
mesonbuild/dependencies/base.py
Unescape View File

@ -1357,7 +1357,11 @@ class CMakeDependency(ExternalDependency):
if 'RELEASE' in cfgs: if 'RELEASE' in cfgs:
cfg = 'RELEASE' 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)] libraries += tgt.properies['IMPORTED_LOCATION_{}'.format(cfg)]
elif 'IMPORTED_LOCATION' in tgt.properies: elif 'IMPORTED_LOCATION' in tgt.properies:
libraries += tgt.properies['IMPORTED_LOCATION'] libraries += tgt.properies['IMPORTED_LOCATION']

Write Preview
Loading…
Cancel
Save