blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #62 from colemickens/giounix20 

meson: fix 'gio-unix-2.0' dependency
This commit is contained in:
Alex 2018-10-27 09:35:47 +02:00 committed by GitHub
parent 1ae490c8f7 0d0a3be483
commit 16b01e1059
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -33,6 +33,7 @@ wayland_protos = dependency('wayland-protocols')
wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots']) wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
gtkmm = dependency('gtkmm-3.0') gtkmm = dependency('gtkmm-3.0')
dbusmenu_gtk = dependency('dbusmenu-gtk3-0.4', required: get_option('dbusmenu-gtk')) dbusmenu_gtk = dependency('dbusmenu-gtk3-0.4', required: get_option('dbusmenu-gtk'))
giounix = dependency('gio-unix-2.0', required: get_option('dbusmenu-gtk'))
jsoncpp = dependency('jsoncpp') jsoncpp = dependency('jsoncpp')
sigcpp = dependency('sigc++-2.0') sigcpp = dependency('sigc++-2.0')
libnl = dependency('libnl-3.0', required: get_option('libnl')) libnl = dependency('libnl-3.0', required: get_option('libnl'))
@ -98,6 +99,7 @@ executable(
wayland_cursor, wayland_cursor,
gtkmm, gtkmm,
dbusmenu_gtk, dbusmenu_gtk,
giounix,
libnl, libnl,
libnlgen, libnlgen,
libpulse libpulse

2
protocol/meson.build
View File

@ -62,7 +62,7 @@ client_protos_headers += gdbus_header.process('./dbus-menu.xml')
lib_client_protos = static_library( lib_client_protos = static_library(
'client_protos', 'client_protos',
client_protos_src + client_protos_headers, client_protos_src + client_protos_headers,
dependencies: [wayland_client, gtkmm], dependencies: [wayland_client, gtkmm, giounix],
include_directories: include_directories('..'), include_directories: include_directories('..'),
) # for the include directory ) # for the include directory