From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH] meson.build: Print gtk version in the summary info
Date: Wed, 5 Jan 2022 20:08:04 +0100 [thread overview]
Message-ID: <20220105190804.649316-1-thuth@redhat.com> (raw)
The "gtk" variable is re-declared as "dependencies: [gtk, gtkx11]",
so there is just a "YES" in the summary info if gtk has been found.
Let's use the info from the library detection instead so that the
library version is printed in the summary instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
meson.build | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 82769749db..798811dfbb 100644
--- a/meson.build
+++ b/meson.build
@@ -1058,11 +1058,11 @@ gtk = not_found
gtkx11 = not_found
vte = not_found
if not get_option('gtk').auto() or (have_system and not cocoa.found())
- gtk = dependency('gtk+-3.0', version: '>=3.22.0',
- method: 'pkg-config',
- required: get_option('gtk'),
- kwargs: static_kwargs)
- if gtk.found()
+ libgtk = dependency('gtk+-3.0', version: '>=3.22.0',
+ method: 'pkg-config',
+ required: get_option('gtk'),
+ kwargs: static_kwargs)
+ if libgtk.found()
gtkx11 = dependency('gtk+-x11-3.0', version: '>=3.22.0',
method: 'pkg-config',
required: false,
@@ -3410,7 +3410,7 @@ if targetos == 'darwin'
endif
summary_info += {'SDL support': sdl}
summary_info += {'SDL image support': sdl_image}
-summary_info += {'GTK support': gtk}
+summary_info += {'GTK support': libgtk}
summary_info += {'pixman': pixman}
summary_info += {'VTE support': vte}
summary_info += {'slirp support': slirp_opt == 'internal' ? slirp_opt : slirp}
--
2.27.0
next reply other threads:[~2022-01-05 19:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-05 19:08 Thomas Huth [this message]
2022-01-05 19:55 ` [PATCH] meson.build: Print gtk version in the summary info Philippe Mathieu-Daudé
2022-01-06 4:11 ` Richard Henderson
2022-01-07 11:59 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220105190804.649316-1-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).