mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: add more version numbers to the summary

Browse Source 
Whenever declare_dependency is used to add some compile flags or dependent
libraries to the outcome of dependency(), the version of the original
dependency is dropped in the summary.  Make sure that declare_dependency()
has a version argument in those cases.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-03-30 12:45:58 +02:00
parent 063d5119c1
commit bd3615d68f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson.build
View File

@ -888,7 +888,8 @@ if have_system and get_option('curses').allowed()
curses_compile_args = ['-DNCURSES_WIDECHAR=1'] curses_compile_args = ['-DNCURSES_WIDECHAR=1']
if curses.found() if curses.found()
if cc.links(curses_test, args: curses_compile_args, dependencies: [curses]) if cc.links(curses_test, args: curses_compile_args, dependencies: [curses])
curses = declare_dependency(compile_args: curses_compile_args, dependencies: [curses]) curses = declare_dependency(compile_args: curses_compile_args, dependencies: [curses],
version: curses.version())
else else
msg = 'curses package not usable' msg = 'curses package not usable'
curses = not_found curses = not_found
@ -977,7 +978,8 @@ endif
if sdl.found() if sdl.found()
# work around 2.0.8 bug # work around 2.0.8 bug
sdl = declare_dependency(compile_args: '-Wno-undef', sdl = declare_dependency(compile_args: '-Wno-undef',
dependencies: sdl) dependencies: sdl,
version: sdl.version())
sdl_image = dependency('SDL2_image', required: get_option('sdl_image'), sdl_image = dependency('SDL2_image', required: get_option('sdl_image'),
method: 'pkg-config') method: 'pkg-config')
else else
@ -1198,9 +1200,10 @@ if not gnutls_crypto.found()
# as it "spreads unnecessary dependencies" which in # as it "spreads unnecessary dependencies" which in
# turn breaks static builds... # turn breaks static builds...
if gcrypt.found() and get_option('prefer_static') if gcrypt.found() and get_option('prefer_static')
gcrypt = declare_dependency(dependencies: [ gcrypt = declare_dependency(dependencies:
gcrypt, [gcrypt,
cc.find_library('gpg-error', required: true)]) cc.find_library('gpg-error', required: true)],
version: gcrypt.version())
endif endif
endif endif
if (not get_option('nettle').auto() or have_system) and not gcrypt.found() if (not get_option('nettle').auto() or have_system) and not gcrypt.found()
@ -1234,7 +1237,8 @@ if not get_option('gtk').auto() or have_system
gtkx11 = dependency('gtk+-x11-3.0', version: '>=3.22.0', gtkx11 = dependency('gtk+-x11-3.0', version: '>=3.22.0',
method: 'pkg-config', method: 'pkg-config',
required: false) required: false)
gtk = declare_dependency(dependencies: [gtk, gtkx11]) gtk = declare_dependency(dependencies: [gtk, gtkx11],
version: gtk.version())
if not get_option('vte').auto() or have_system if not get_option('vte').auto() or have_system
vte = dependency('vte-2.91', vte = dependency('vte-2.91',