diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2018-12-17 11:18:06 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-12-17 17:11:00 +0000 |
| commit | a26cce1833b7027af409d2c3e377b62035e16b38 (patch) | |
| tree | df0582e1ba3d3ba2eeb74801f0a65214cafed6c2 /ext | |
| parent | d49bc71f006accf2851d54fd0530011c284bba51 (diff) | |
| download | gstreamer-plugins-bad-a26cce1833b7027af409d2c3e377b62035e16b38.tar.gz | |
meson: wildmidi detection fixes
Need at least 0.4.2 apparently.
ext/wildmidi/meson.build:11:2: ERROR: String '' cannot be converted to int
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/wildmidi/meson.build | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/wildmidi/meson.build b/ext/wildmidi/meson.build index 902e06622..dd0a8f66e 100644 --- a/ext/wildmidi/meson.build +++ b/ext/wildmidi/meson.build @@ -8,10 +8,14 @@ wildmidi_dep = dependency('WildMIDI', version: '>= 0.4.2', required: false) if not wildmidi_dep.found() and cc.has_header ('wildmidi_lib.h') wildmidi_ver_maj = cc.get_define('LIBWILDMIDI_VER_MAJOR', prefix: '#include <wildmidi_lib.h>') wildmidi_ver_min = cc.get_define('LIBWILDMIDI_VER_MINOR', prefix: '#include <wildmidi_lib.h>') - wildmidi_ver_maj = ''.join(wildmidi_ver_maj.split('L')).to_int() # '0L' -> 0 - wildmidi_ver_min = ''.join(wildmidi_ver_min.split('L')).to_int() # '4L' -> 4 - if wildmidi_ver_maj == 0 and wildmidi_ver_min >= 4 - wildmidi_dep = cc.find_library('WildMidi', required: false) + if wildmidi_ver_maj != '' and wildmidi_ver_min != '' + wildmidi_ver_maj = ''.join(wildmidi_ver_maj.split('L')).to_int() # '0L' -> 0 + wildmidi_ver_min = ''.join(wildmidi_ver_min.split('L')).to_int() # '4L' -> 4 + if wildmidi_ver_maj == 0 and wildmidi_ver_min >= 4 + wildmidi_dep = cc.find_library('WildMidi', required: false) + else + message('WildMidi version too old, need >= 0.4.x') + endif else message('WildMidi version too old, need >= 0.4.x') endif |