AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

meson: Add wayland-client to gtk4-wayland requires

Browse Source
This commit is contained in:
Xavier Claessens 2023-08-15 13:35:46 -04:00
parent 9558c70683
commit 090e01b383
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/wayland/meson.build
View File

@ -127,3 +127,6 @@ libgdk_wayland = static_library('gdk-wayland',
link_with: [ libwayland_cursor, ], link_with: [ libwayland_cursor, ],
dependencies: [ gdk_deps, gdk_wayland_deps ], dependencies: [ gdk_deps, gdk_wayland_deps ],
) )
# Used to generate pkg-config Requires
wayland_public_deps = [wlclientdep]

17
meson.build
View File

@ -826,19 +826,15 @@ gsk_private_packages = [] # all already in gdk_private_packages
pangoft2_pkgs = (wayland_enabled or x11_enabled) ? ['pangoft2'] : [] pangoft2_pkgs = (wayland_enabled or x11_enabled) ? ['pangoft2'] : []
gtk_private_packages = pangoft2_pkgs gtk_private_packages = pangoft2_pkgs
pkgs = [] enabled_backends = []
pkg_targets = []
display_backends = []
foreach backend: [ 'broadway', 'macos', 'wayland', 'win32', 'x11', ] foreach backend: [ 'broadway', 'macos', 'wayland', 'win32', 'x11', ]
if get_variable('@0@_enabled'.format(backend)) if get_variable('@0@_enabled'.format(backend))
pkgs += ['gtk4-@0@'.format(backend)] enabled_backends += backend
pkg_targets += backend
display_backends += [ backend ]
endif endif
endforeach endforeach
common_pc_variables = [ common_pc_variables = [
'targets=@0@'.format(' '.join(pkg_targets)), 'targets=@0@'.format(' '.join(enabled_backends)),
'gtk_binary_version=@0@'.format(gtk_binary_version), 'gtk_binary_version=@0@'.format(gtk_binary_version),
'gtk_host=@0@-@1@'.format(host_machine.cpu_family(), host_machine.system()), # FIXME 'gtk_host=@0@-@1@'.format(host_machine.cpu_family(), host_machine.system()), # FIXME
] ]
@ -853,13 +849,14 @@ pkg_config.generate(libgtk,
) )
meson.override_dependency('gtk4', libgtk_dep) meson.override_dependency('gtk4', libgtk_dep)
foreach pkg: pkgs foreach backend: enabled_backends
pkg = 'gtk4-@0@'.format(backend)
pkg_config.generate( pkg_config.generate(
filebase: pkg, filebase: pkg,
unescaped_variables: common_pc_variables, unescaped_variables: common_pc_variables,
name: 'GTK', name: 'GTK',
description: 'GTK Graphical UI Library', description: 'GTK Graphical UI Library',
requires: 'gtk4', requires: ['gtk4', get_variable('@0@_public_deps'.format(backend), [])],
) )
meson.override_dependency(pkg, libgtk_dep) meson.override_dependency(pkg, libgtk_dep)
endforeach endforeach
@ -904,7 +901,7 @@ endif
#### Summary #### #### Summary ####
summary('Display backends', display_backends, section: 'Components') summary('Display backends', enabled_backends, section: 'Components')
summary('Print backends', print_backends, section: 'Components') summary('Print backends', print_backends, section: 'Components')
summary('Media backends', media_backends, section: 'Components') summary('Media backends', media_backends, section: 'Components')