Skip to content

Commit bcf8bb9

Browse files
committed
meson: bump minimum version to 0.55
This is now sufficient for the oldest supported Debian and Ubuntu releases, and lets us assume dependency('foo') is sufficient for falling back to foo.wrap. Fixes Meson warning: WARNING: Project specifies a minimum meson_version '>=0.50' but uses features which were added in newer versions: * 0.54.0: {'fallback arg in dependency'}
1 parent d17f350 commit bcf8bb9

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

meson.build

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(
99
'buildtype=debugoptimized',
1010
],
1111
license : 'MIT',
12-
meson_version : '>=0.50',
12+
meson_version : '>=0.55',
1313
version : '1.2.0'
1414
)
1515
if not meson.is_subproject()
@@ -82,15 +82,11 @@ if found_uthash
8282
else
8383
# fall back to dependency() rather than subproject() so
8484
# --wrap-mode=nofallback works
85-
uthash = dependency(
86-
'uthash',
87-
fallback : ['uthash', 'uthash_dep'],
88-
)
85+
uthash = dependency('uthash')
8986
endif
9087
if get_option('tests')
9188
check = dependency(
9289
'check',
93-
fallback : ['check', 'check_dep'],
9490
version : '>=0.9.6',
9591
)
9692
endif
@@ -192,9 +188,7 @@ libdicom_dep = declare_dependency(
192188
include_directories : [library_includes, include_directories('.')],
193189
link_with : libdicom,
194190
)
195-
if meson.version().version_compare('>=0.54')
196-
meson.override_dependency('libdicom', libdicom_dep)
197-
endif
191+
meson.override_dependency('libdicom', libdicom_dep)
198192

199193
# tools
200194
executable(

0 commit comments

Comments
 (0)