From a26cce1833b7027af409d2c3e377b62035e16b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 17 Dec 2018 11:18:06 +0000 Subject: [PATCH] meson: wildmidi detection fixes Need at least 0.4.2 apparently. ext/wildmidi/meson.build:11:2: ERROR: String '' cannot be converted to int --- ext/wildmidi/meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ext/wildmidi/meson.build b/ext/wildmidi/meson.build index 902e066222..dd0a8f66e1 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_ver_min = cc.get_define('LIBWILDMIDI_VER_MINOR', prefix: '#include ') - 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