Re: [PATCH] meson.build: Print gtk version in the summary info

[Thomas Huth]

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 <th...@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}