meson: use variables for gio-2.0, glib-2.0, and gio-unix-2.0

This commit is contained in:
Tristan Partin
2023-07-28 14:00:04 -05:00
parent 39fc1161f6
commit f93767cfb2
6 changed files with 10 additions and 10 deletions

View File

@ -3,7 +3,7 @@ libeggbitset_sources = [
] ]
libeggbitset_deps = [ libeggbitset_deps = [
dependency('gio-2.0', version: glib_req_version), gio_dep,
] ]
libeggbitset_static = static_library('eggbitset', libeggbitset_sources, libeggbitset_static = static_library('eggbitset', libeggbitset_sources,

View File

@ -1,5 +1,5 @@
liblinereader_deps = [ liblinereader_deps = [
dependency('gio-2.0', version: glib_req_version), gio_dep,
] ]
liblinereader_static_dep = declare_dependency( liblinereader_static_dep = declare_dependency(

View File

@ -60,6 +60,8 @@ cc = meson.get_compiler('c')
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
glib_dep = dependency('glib-2.0', version: glib_req_version, required: need_glib) glib_dep = dependency('glib-2.0', version: glib_req_version, required: need_glib)
gio_dep = dependency('gio-2.0', version: glib_req_version, required: need_glib)
gio_unix_dep = dependency('gio-unix-2.0', version: glib_req_version, required: host_machine.system() != 'windows')
gtk_dep = dependency('gtk4', version: gtk_req_version, required: need_gtk) gtk_dep = dependency('gtk4', version: gtk_req_version, required: need_gtk)
libsystemd_dep = dependency('libsystemd', required: false) libsystemd_dep = dependency('libsystemd', required: false)

View File

@ -25,7 +25,7 @@ libsysprof_capture_testsuite = {
} }
libsysprof_capture_testsuite_deps = [ libsysprof_capture_testsuite_deps = [
dependency('gio-2.0'), gio_dep,
libsysprof_capture_dep, libsysprof_capture_dep,
] ]

View File

@ -171,10 +171,8 @@ libsysprof_resources = gnome.compile_resources('libsysprof-resources', 'libsyspr
) )
libsysprof_deps = [ libsysprof_deps = [
dependency('gio-2.0', version: glib_req_version), gio_dep,
dependency('gio-unix-2.0', gio_unix_dep,
version: glib_req_version,
required: host_machine.system() != 'windows'),
dependency('libdex-1', version: dex_req_version), dependency('libdex-1', version: dex_req_version),
dependency('json-glib-1.0'), dependency('json-glib-1.0'),

View File

@ -23,9 +23,9 @@ sysprofd_sources = [
pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir')) pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
sysprofd_deps = [ sysprofd_deps = [
dependency('glib-2.0', version: glib_req_version), glib_dep,
dependency('gio-2.0', version: glib_req_version), gio_dep,
dependency('gio-unix-2.0', version: glib_req_version), gio_unix_dep,
polkit_dep, polkit_dep,
libsysprof_capture_dep, libsysprof_capture_dep,