depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

meson: Avoid repeating the needed glib version multiple times

Browse source 
Just define once and modify its syntax when needed.
Use a more verbose definition for the min/max version (instead of just
join the split version) so that in case we may depend on a specifc glib
micro release during development.
This commit is contained in:
Marco Trevisan (Treviño) 2019-11-22 14:09:51 +01:00
parent 099fa9f005
commit ceb62d7617
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
meson.build
View file

@ -18,7 +18,10 @@ libfprint_conf = configuration_data()
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
cpp = meson.get_compiler('cpp') cpp = meson.get_compiler('cpp')
host_system = host_machine.system() host_system = host_machine.system()
glib_min_version = '2.50'
glib_version_def = 'GLIB_VERSION_@0@_@1@'.format(
glib_min_version.split('.')[0], glib_min_version.split('.')[1])
common_cflags = cc.get_supported_arguments([ common_cflags = cc.get_supported_arguments([
'-fgnu89-inline', '-fgnu89-inline',
'-std=gnu99', '-std=gnu99',
@ -30,8 +33,8 @@ common_cflags = cc.get_supported_arguments([
'-Werror-implicit-function-declaration', '-Werror-implicit-function-declaration',
'-Wno-pointer-sign', '-Wno-pointer-sign',
'-Wshadow', '-Wshadow',
'-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50', '-DGLIB_VERSION_MIN_REQUIRED=' + glib_version_def,
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_50', '-DGLIB_VERSION_MAX_ALLOWED=' + glib_version_def,
]) ])
# maintaining compatibility with the previous libtool versioning # maintaining compatibility with the previous libtool versioning
@ -43,8 +46,8 @@ revision = 0
libversion = '@0@.@1@.@2@'.format(soversion, current, revision) libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
# Dependencies # Dependencies
glib_dep = dependency('glib-2.0', version: '>= 2.50') glib_dep = dependency('glib-2.0', version: '>=' + glib_min_version)
gio_dep = dependency('gio-unix-2.0', version: '>= 2.44.0') gio_dep = dependency('gio-unix-2.0', version: '>=' + glib_min_version)
gusb_dep = dependency('gusb', version: '>= 0.3.0') gusb_dep = dependency('gusb', version: '>= 0.3.0')
mathlib_dep = cc.find_library('m', required: false) mathlib_dep = cc.find_library('m', required: false)