mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-05 13:29:57 -05:00
build-sys: meson: Make glib and fftw common dependencies
GSettings module (daemon) requires both gio and glib, move glib to common block. qpaeq requires fftw, move fftw to common block. Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/659>
This commit is contained in:
parent
5fcc70e2e8
commit
56a9743fcb
3 changed files with 15 additions and 15 deletions
|
|
@ -8,7 +8,7 @@ gsettings_helper = executable('gsettings-helper',
|
|||
gsettings_helper_sources,
|
||||
c_args : pa_c_args,
|
||||
include_directories : [configinc, topinc],
|
||||
dependencies : [gio_dep, libpulsecommon_dep, libpulse_dep],
|
||||
dependencies : [gio_dep, glib_dep, libpulsecommon_dep, libpulse_dep],
|
||||
install_dir : pulselibexecdir,
|
||||
install_rpath : privlibdir,
|
||||
install : true,
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ if dbus_dep.found() and fftw_dep.found()
|
|||
]
|
||||
endif
|
||||
|
||||
if get_option('gsettings').enabled() and gio_dep.found()
|
||||
if get_option('gsettings').enabled() and glib_dep.found() and gio_dep.found()
|
||||
subdir('gsettings')
|
||||
all_modules += [
|
||||
[ 'module-gsettings',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue