* [PATCH] meson.build: Print gtk version in the summary info
@ 2022-01-05 19:08 Thomas Huth
2022-01-05 19:55 ` Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Thomas Huth @ 2022-01-05 19:08 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Paolo Bonzini
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] meson.build: Print gtk version in the summary info
2022-01-05 19:08 [PATCH] meson.build: Print gtk version in the summary info Thomas Huth
@ 2022-01-05 19:55 ` Philippe Mathieu-Daudé
2022-01-06 4:11 ` Richard Henderson
2022-01-07 11:59 ` Thomas Huth
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-01-05 19:55 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: qemu-trivial, Paolo Bonzini
On 5/1/22 20:08, Thomas Huth wrote:
> 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(-)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] meson.build: Print gtk version in the summary info
2022-01-05 19:08 [PATCH] meson.build: Print gtk version in the summary info Thomas Huth
2022-01-05 19:55 ` Philippe Mathieu-Daudé
@ 2022-01-06 4:11 ` Richard Henderson
2022-01-07 11:59 ` Thomas Huth
2 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2022-01-06 4:11 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: qemu-trivial, Paolo Bonzini
On 1/5/22 11:08 AM, Thomas Huth wrote:
> 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(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] meson.build: Print gtk version in the summary info
2022-01-05 19:08 [PATCH] meson.build: Print gtk version in the summary info Thomas Huth
2022-01-05 19:55 ` Philippe Mathieu-Daudé
2022-01-06 4:11 ` Richard Henderson
@ 2022-01-07 11:59 ` Thomas Huth
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2022-01-07 11:59 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Paolo Bonzini
On 05/01/2022 20.08, Thomas Huth wrote:
> 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
Drat, I'm missing a "libgtk = not_found" here ... I'll send a v2.
Thomas
> 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}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-07 12:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-05 19:08 [PATCH] meson.build: Print gtk version in the summary info Thomas Huth
2022-01-05 19:55 ` Philippe Mathieu-Daudé
2022-01-06 4:11 ` Richard Henderson
2022-01-07 11:59 ` Thomas Huth
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.