daemon: let meson handle the uninstalled media-session path

If we build media-session before the daemon we have the executable
variable available and can rely on meson to fill in the path instead of
handling it manually.
This commit is contained in:
Peter Hutterer 2021-10-13 10:04:39 +10:00 committed by Wim Taymans
parent c81dcae683
commit 87a1e1534c
2 changed files with 2 additions and 3 deletions

View file

@ -40,8 +40,7 @@ endif
if default_sm == ''
summary({'No session manager': 'pw-uninstalled.sh will not work out of the box!'})
elif default_sm == 'media-session'
conf_config_uninstalled.set('session_manager_path',
meson.build_root() / 'src' / 'media-session' / 'pipewire-media-session')
conf_config_uninstalled.set('session_manager_path', pipewire_media_session.full_path())
conf_config_uninstalled.set('sm_comment', '')
elif default_sm == 'wireplumber'
wp_bindir = wp_proj.get_variable('wireplumber_bin_dir', pipewire_bindir)

View file

@ -1,9 +1,9 @@
subdir('pipewire')
subdir('media-session')
subdir('daemon')
subdir('tools')
subdir('modules')
subdir('media-session')
if not get_option('examples').disabled()
subdir('examples')
endif