meson: replace join_paths(a, b) with a / b

More readable and from the meson reference manual:
(since 0.49.0) Using the/ operator on strings is equivalent to calling join_paths.
This commit is contained in:
Peter Hutterer 2021-04-15 14:41:04 +10:00 committed by Wim Taymans
parent 2f78829fda
commit 223f20709d
34 changed files with 98 additions and 98 deletions

View File

@ -12,10 +12,10 @@ endif
inputs = ''
foreach h : pipewire_headers
inputs += ' ' + join_paths(meson.source_root(), 'src', 'pipewire', h)
inputs += ' ' + meson.source_root() / 'src' / 'pipewire' / h
endforeach
foreach h : pipewire_sources
inputs += ' ' + join_paths(meson.source_root(), 'src', 'pipewire', h)
inputs += ' ' + meson.source_root() / 'src' / 'pipewire' / h
endforeach
doxyfile_conf.set('inputs', inputs)
@ -24,11 +24,11 @@ doxyfile = configure_file(input: 'Doxyfile.in',
output: 'Doxyfile',
configuration: doxyfile_conf)
docdir = join_paths(pipewire_datadir, 'doc')
docdir = pipewire_datadir / 'doc'
html_target = custom_target('pipewire-docs',
input: [ doxyfile ],
output: [ 'html' ],
command: [ doxygen, doxyfile ],
install: true,
install_dir: join_paths(docdir, 'pipewire'))
install_dir: docdir / 'pipewire')

View File

@ -36,5 +36,5 @@ foreach m : manpages
command : [xmltoman, '@INPUT@'],
capture : true,
install : true,
install_dir : join_paths(get_option('mandir'), 'man' + m.get(1)))
install_dir : get_option('mandir') / 'man' + m.get(1))
endforeach

View File

@ -29,15 +29,15 @@ pipewire_name = 'pipewire-@0@'.format(apiversion)
spa_name = 'spa-@0@'.format(spaversion)
prefix = get_option('prefix')
pipewire_bindir = join_paths(prefix, get_option('bindir'))
pipewire_datadir = join_paths(prefix, get_option('datadir'))
pipewire_libdir = join_paths(prefix, get_option('libdir'))
pipewire_libexecdir = join_paths(prefix, get_option('libexecdir'))
pipewire_localedir = join_paths(prefix, get_option('localedir'))
pipewire_sysconfdir = join_paths(prefix, get_option('sysconfdir'))
pipewire_bindir = prefix / get_option('bindir')
pipewire_datadir = prefix / get_option('datadir')
pipewire_libdir = prefix / get_option('libdir')
pipewire_libexecdir = prefix / get_option('libexecdir')
pipewire_localedir = prefix / get_option('localedir')
pipewire_sysconfdir = prefix / get_option('sysconfdir')
pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire')
modules_install_dir = join_paths(pipewire_libdir, pipewire_name)
pipewire_configdir = pipewire_sysconfdir / 'pipewire'
modules_install_dir = pipewire_libdir / pipewire_name
if host_machine.system() == 'linux'
# glibc ld.so interprets ${LIB} in a library loading path with an
@ -48,16 +48,16 @@ if host_machine.system() == 'linux'
# like LD_LIBRARY_PATH='/usr/${LIB}/pipewire-0.3/jack'.
# Note that ${LIB} is a special token expanded by the runtime linker,
# not an environment variable, and must be passed through literally.
modules_install_dir_dlopen = join_paths(prefix, '${LIB}', pipewire_name)
modules_install_dir_dlopen = prefix / '${LIB}' / pipewire_name
else
modules_install_dir_dlopen = modules_install_dir
endif
spa_plugindir = join_paths(pipewire_libdir, spa_name)
spa_plugindir = pipewire_libdir / spa_name
alsadatadir = join_paths(pipewire_datadir, 'alsa-card-profile', 'mixer')
alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer'
pipewire_headers_dir = join_paths(pipewire_name, 'pipewire')
pipewire_headers_dir = pipewire_name / 'pipewire'
gnome = import('gnome')
pkgconfig = import('pkgconfig')
@ -202,8 +202,8 @@ cdata.set('VERSION', '"@0@"'.format(pipewire_version))
cdata.set('PLUGINDIR', '"@0@"'.format(spa_plugindir))
# FIXME: --with-memory-alignment],[8,N,malloc,pagesize (default is 32)]) option
cdata.set('MEMORY_ALIGNMENT_MALLOC', 1)
cdata.set_quoted('PA_ALSA_PATHS_DIR', join_paths(alsadatadir, 'paths'))
cdata.set_quoted('PA_ALSA_PROFILE_SETS_DIR', join_paths(alsadatadir, 'profile-sets'))
cdata.set_quoted('PA_ALSA_PATHS_DIR', alsadatadir / 'paths')
cdata.set_quoted('PA_ALSA_PROFILE_SETS_DIR', alsadatadir / 'profile-sets')
check_headers = [['dlfcn.h','HAVE_DLFCN_H'],
@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd'
alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa'))
installed_tests_metadir = join_paths(pipewire_datadir, 'installed-tests', pipewire_name)
installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pipewire_name)
installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name
installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name
installed_tests_enabled = not get_option('installed_tests').disabled()
installed_tests_template = files('template.test.in')

View File

@ -16,7 +16,7 @@ pipewire_alsa_pcm_plugin = shared_library('asound_module_pcm_pipewire',
include_directories : [configinc],
dependencies : [pipewire_dep, alsa_dep],
install : true,
install_dir : join_paths(pipewire_libdir, 'alsa-lib'),
install_dir : pipewire_libdir / 'alsa-lib',
)
pipewire_alsa_ctl_plugin = shared_library('asound_module_ctl_pipewire',
pipewire_alsa_plugin_ctl_sources,
@ -24,5 +24,5 @@ pipewire_alsa_ctl_plugin = shared_library('asound_module_ctl_pipewire',
include_directories : [configinc],
dependencies : [pipewire_dep, alsa_dep],
install : true,
install_dir : join_paths(pipewire_libdir, 'alsa-lib'),
install_dir : pipewire_libdir / 'alsa-lib',
)

View File

@ -1,4 +1,4 @@
alsaconfdir = join_paths(pipewire_datadir, 'alsa', 'alsa.conf.d')
alsaconfdir = pipewire_datadir / 'alsa' / 'alsa.conf.d'
install_data(['50-pipewire.conf', '99-pipewire-default.conf'],
install_dir: alsaconfdir,

View File

@ -22,8 +22,8 @@ pipewire_jack_c_args = [
libjack_path = get_option('libjack-path')
if libjack_path == ''
libjack_path = join_paths(modules_install_dir, 'jack')
libjack_path_dlopen = join_paths(modules_install_dir_dlopen, 'jack')
libjack_path = modules_install_dir / 'jack'
libjack_path_dlopen = modules_install_dir_dlopen / 'jack'
else
libjack_path_dlopen = libjack_path
endif
@ -75,7 +75,7 @@ if sdl_dep.found()
c_args : [ '-D_GNU_SOURCE' ],
include_directories : [jack_inc],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples', 'jack'),
install_dir : installed_tests_execdir / 'examples' / 'jack',
dependencies : [sdl_dep, mathlib],
link_with: pipewire_jack,
)

View File

@ -4,7 +4,7 @@ if sdl_dep.found()
c_args : ['-D_GNU_SOURCE'],
dependencies : [dl_lib, sdl_dep, pthread_lib],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples', 'spa'))
install_dir : installed_tests_execdir / 'examples' / 'spa')
if libcamera_dep.found()
executable('local-libcamera', 'local-libcamera.c',
@ -12,7 +12,7 @@ if sdl_dep.found()
c_args : ['-D_GNU_SOURCE'],
dependencies : [dl_lib, sdl_dep, pthread_lib, libcamera_dep],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples', 'spa'))
install_dir : installed_tests_execdir / 'examples' / 'spa')
endif
endif
@ -21,11 +21,11 @@ executable('example-control', 'example-control.c',
c_args : ['-D_GNU_SOURCE'],
dependencies : [dl_lib, pthread_lib, mathlib],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples', 'spa'))
install_dir : installed_tests_execdir / 'examples' / 'spa')
executable('adapter-control', 'adapter-control.c',
include_directories : [configinc, spa_inc],
c_args : ['-D_GNU_SOURCE'],
dependencies : [dl_lib, pthread_lib, mathlib],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples', 'spa'))
install_dir : installed_tests_execdir / 'examples' / 'spa')

View File

@ -19,7 +19,7 @@ spa_alsa = shared_library(
dependencies : [ alsa_dep, libudev_dep, mathlib ],
link_with : [ acp_lib ],
install : true,
install_dir : join_paths(spa_plugindir, 'alsa')
install_dir : spa_plugindir / 'alsa'
)
alsa_udevrules = [

View File

@ -111,7 +111,7 @@ audioconvertlib = shared_library('spa-audioconvert',
dependencies : [ mathlib ],
link_with : audioconvert,
install : true,
install_dir : join_paths(spa_plugindir, 'audioconvert'))
install_dir : spa_plugindir / 'audioconvert')
test_lib = static_library('test_lib',
['test-source.c' ],
@ -134,10 +134,10 @@ foreach a : test_apps
dependencies : [dl_lib, pthread_lib, mathlib ],
include_directories : [ configinc, spa_inc ],
link_with : [ audioconvert, test_lib, audioconvertlib ],
install_rpath : join_paths(spa_plugindir, 'audioconvert'),
install_rpath : spa_plugindir / 'audioconvert',
c_args : [ simd_cargs, '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'audioconvert')),
install_dir : installed_tests_execdir / 'audioconvert'),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
])
@ -145,11 +145,11 @@ foreach a : test_apps
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec',
join_paths(installed_tests_execdir, 'audioconvert', a))
installed_tests_execdir / 'audioconvert' / a)
configure_file(
input: installed_tests_template,
output: a + '.test',
install_dir: join_paths(installed_tests_metadir, 'audioconvert'),
install_dir: installed_tests_metadir / 'audioconvert',
configuration: test_conf
)
endif
@ -167,9 +167,9 @@ foreach a : benchmark_apps
include_directories : [ configinc, spa_inc ],
c_args : [ simd_cargs, '-D_GNU_SOURCE' ],
link_with : [ audioconvert, audioconvertlib ],
install_rpath : join_paths(spa_plugindir, 'audioconvert'),
install_rpath : spa_plugindir / 'audioconvert',
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'audioconvert')),
install_dir : installed_tests_execdir / 'audioconvert'),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
])
@ -177,11 +177,11 @@ foreach a : benchmark_apps
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec',
join_paths(installed_tests_execdir, 'audioconvert', a))
installed_tests_execdir / 'audioconvert' / a)
configure_file(
input: installed_tests_template,
output: a + '.test',
install_dir: join_paths(installed_tests_metadir, 'audioconvert'),
install_dir: installed_tests_metadir / 'audioconvert',
configuration: test_conf
)
endif

View File

@ -53,4 +53,4 @@ audiomixerlib = shared_library('spa-audiomixer',
include_directories : [spa_inc],
dependencies : [ mathlib ],
install : true,
install_dir : join_paths(spa_plugindir, 'audiomixer'))
install_dir : spa_plugindir / 'audiomixer')

View File

@ -5,4 +5,4 @@ audiotestsrclib = shared_library('spa-audiotestsrc',
include_directories : [spa_inc],
dependencies : [mathlib, ],
install : true,
install_dir : join_paths(spa_plugindir, 'audiotestsrc'))
install_dir : spa_plugindir / 'audiotestsrc')

View File

@ -71,4 +71,4 @@ bluez5lib = shared_library('spa-bluez5',
c_args : bluez5_args,
dependencies : bluez5_deps,
install : true,
install_dir : join_paths(spa_plugindir, 'bluez5'))
install_dir : spa_plugindir / 'bluez5')

View File

@ -6,4 +6,4 @@ controllib = shared_library('spa-control',
include_directories : [spa_inc],
dependencies : [ mathlib ],
install : true,
install_dir : join_paths(spa_plugindir, 'control'))
install_dir : spa_plugindir / 'control')

View File

@ -7,4 +7,4 @@ ffmpeglib = shared_library('spa-ffmpeg',
include_directories : [spa_inc],
dependencies : [ avcodec_dep, avformat_dep ],
install : true,
install_dir : join_paths(spa_plugindir, 'ffmpeg'))
install_dir : spa_plugindir / 'ffmpeg')

View File

@ -9,4 +9,4 @@ spa_jack = shared_library('spa-jack',
include_directories : [spa_inc],
dependencies : [ jack_dep, mathlib ],
install : true,
install_dir : join_paths(spa_plugindir, 'jack'))
install_dir : spa_plugindir / 'jack')

View File

@ -12,5 +12,5 @@ libcameralib = shared_library('spa-libcamera',
include_directories : [ spa_inc ],
dependencies : [ libudev_dep, libcamera_dep, pthread_lib, libdrm_dep ],
install : true,
install_dir : join_paths(spa_plugindir, 'libcamera'))
install_dir : spa_plugindir / 'libcamera')
endif

View File

@ -12,7 +12,7 @@ spa_support_lib = shared_library('spa-support',
include_directories : [ spa_inc ],
dependencies : [ pthread_lib, epoll_shim_dep ],
install : true,
install_dir : join_paths(spa_plugindir, 'support'))
install_dir : spa_plugindir / 'support')
if not get_option('evl').disabled()
@ -29,7 +29,7 @@ if not get_option('evl').disabled()
include_directories : [ spa_inc, evl_inc],
dependencies : [ pthread_lib, evl_lib],
install : true,
install_dir : join_paths(spa_plugindir, 'support'))
install_dir : spa_plugindir / 'support')
endif
spa_dbus_sources = ['dbus.c']
@ -39,7 +39,7 @@ spa_dbus_lib = shared_library('spa-dbus',
include_directories : [ spa_inc],
dependencies : [dbus_dep, ],
install : true,
install_dir : join_paths(spa_plugindir, 'support'))
install_dir : spa_plugindir / 'support')
if systemd_dep.found()
@ -50,5 +50,5 @@ if systemd_dep.found()
include_directories : spa_inc,
dependencies : systemd_dep,
install : true,
install_dir : join_paths(spa_plugindir, 'support'))
install_dir : spa_plugindir / 'support')
endif

View File

@ -5,4 +5,4 @@ testlib = shared_library('spa-test',
include_directories : [ spa_inc],
dependencies : [pthread_lib, ],
install : true,
install_dir : join_paths(spa_plugindir, 'test'))
install_dir : spa_plugindir / 'test')

View File

@ -8,4 +8,4 @@ v4l2lib = shared_library('spa-v4l2',
include_directories : [ spa_inc ],
dependencies : [ libudev_dep, libinotify_dep ],
install : true,
install_dir : join_paths(spa_plugindir, 'v4l2'))
install_dir : spa_plugindir / 'v4l2')

View File

@ -11,4 +11,4 @@ videoconvertlib = shared_library('spa-videoconvert',
dependencies : [ mathlib ],
link_with : simd_dependencies,
install : true,
install_dir : join_paths(spa_plugindir, 'videoconvert'))
install_dir : spa_plugindir / 'videoconvert')

View File

@ -5,4 +5,4 @@ videotestsrclib = shared_library('spa-videotestsrc',
include_directories : [ spa_inc],
dependencies : [pthread_lib, ],
install : true,
install_dir : join_paths(spa_plugindir, 'videotestsrc'))
install_dir : spa_plugindir / 'videotestsrc')

View File

@ -4,4 +4,4 @@ volumelib = shared_library('spa-volume',
volume_sources,
include_directories : [spa_inc],
install : true,
install_dir : join_paths(spa_plugindir, 'volume'))
install_dir : spa_plugindir / 'volume')

View File

@ -7,4 +7,4 @@ spa_vulkan = shared_library('spa-vulkan',
include_directories : [spa_inc],
dependencies : [ vulkan_dep, mathlib ],
install : true,
install_dir : join_paths(spa_plugindir, 'vulkan'))
install_dir : spa_plugindir / 'vulkan')

View File

@ -20,7 +20,7 @@ foreach a : test_apps
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec', join_paths(installed_tests_execdir, 'spa-' + a))
test_conf.set('exec', installed_tests_execdir / 'spa-' + a)
configure_file(
input: installed_tests_template,
output: 'spa-' + a + '.test',
@ -39,7 +39,7 @@ test_cpp = executable('spa-test-cpp', 'test-cpp.cpp',
test('spa-test-cpp', test_cpp)
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec', join_paths(installed_tests_execdir, 'spa-test-cpp'))
test_conf.set('exec', installed_tests_execdir / 'spa-test-cpp')
configure_file(
input: installed_tests_template,
output: 'spa-test-cpp.test',
@ -69,7 +69,7 @@ foreach a : benchmark_apps
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec', join_paths(installed_tests_execdir, 'spa-' + a))
test_conf.set('exec', installed_tests_execdir / 'spa-' + a)
configure_file(
input: installed_tests_template,
output: 'spa-' + a + '.test',

View File

@ -11,11 +11,11 @@ foreach c : conf_files
configure_file(input : c.get(0),
output : c.get(1),
configuration : conf_config,
install_dir : join_paths(conf_install_dir, 'media-session.d'))
install_dir : conf_install_dir / 'media-session.d')
endforeach
install_data(
sources : [
'with-jack',
'with-pulseaudio' ],
install_dir : join_paths(conf_install_dir, 'media-session.d'))
install_dir : conf_install_dir / 'media-session.d')

View File

@ -10,19 +10,19 @@ pipewire_c_args = [
conf_config = configuration_data()
conf_config.set('VERSION', '"@0@"'.format(pipewire_version))
conf_config.set('media_session_path', join_paths(pipewire_bindir, 'pipewire-media-session'))
conf_config.set('pipewire_path', join_paths(pipewire_bindir, 'pipewire'))
conf_config.set('pipewire_pulse_path', join_paths(pipewire_bindir, 'pipewire-pulse'))
conf_config.set('media_session_path', pipewire_bindir / 'pipewire-media-session')
conf_config.set('pipewire_path', pipewire_bindir / 'pipewire')
conf_config.set('pipewire_pulse_path', pipewire_bindir / 'pipewire-pulse')
conf_config.set('comment', '#')
conf_install_dir = join_paths(get_option('sysconfdir'), 'pipewire')
conf_install_dir = get_option('sysconfdir') / 'pipewire'
conf_config_uninstalled = conf_config
conf_config_uninstalled.set('media_session_path',
join_paths(meson.build_root(), 'src', 'examples', 'pipewire-media-session'))
meson.build_root() / 'src' / 'examples' / 'pipewire-media-session')
conf_config_uninstalled.set('pipewire_path',
join_paths(meson.build_root(), 'src', 'daemon', 'pipewire'))
meson.build_root() / 'src' / 'daemon' / 'pipewire')
conf_config_uninstalled.set('pipewire_pulse_path',
join_paths(meson.build_root(), 'src', 'daemon', 'pipewire-pulse'))
meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse')
conf_config_uninstalled.set('comment', '')
@ -77,7 +77,7 @@ custom_target('pipewire-uninstalled',
# po_dir : po_dir,
# type : 'desktop',
# install : true,
# install_dir : join_paths(pipewire_sysconfdir, 'xdg', 'autostart')
# install_dir : pipewire_sysconfdir / 'xdg' / 'autostart'
#)
#
#desktop_utils = find_program('desktop-file-validate', required: false)

View File

@ -4,8 +4,8 @@ install_data(sources : 'pipewire.socket',
install_dir : systemd_system_services_dir)
systemd_config = configuration_data()
systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))
systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire')
systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session')
configure_file(input : 'pipewire.service.in',
output : 'pipewire.service',

View File

@ -8,9 +8,9 @@ install_data(
install_dir : systemd_user_services_dir)
systemd_config = configuration_data()
systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse'))
systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))
systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire')
systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse')
systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session')
configure_file(input : 'pipewire.service.in',
output : 'pipewire.service',

View File

@ -2,42 +2,42 @@ executable('video-src',
'video-src.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
executable('video-src-alloc',
'video-src-alloc.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
executable('video-src-reneg',
'video-src-reneg.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
executable('audio-src',
'audio-src.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
executable('audio-dsp-src',
'audio-dsp-src.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
executable('export-source',
'export-source.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
@ -45,7 +45,7 @@ executable('audio-dsp-filter',
'audio-dsp-filter.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
@ -53,7 +53,7 @@ executable('export-spa',
'export-spa.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
@ -61,7 +61,7 @@ executable('export-spa-device',
'export-spa-device.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
@ -114,7 +114,7 @@ executable('bluez-session',
'bluez-session.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
@ -123,21 +123,21 @@ if sdl_dep.found()
'video-play.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, sdl_dep, mathlib],
)
executable('video-play-reneg',
'video-play-reneg.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, sdl_dep, mathlib],
)
executable('video-dsp-play',
'video-dsp-play.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, sdl_dep, mathlib],
)
@ -145,7 +145,7 @@ if sdl_dep.found()
'local-v4l2.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, sdl_dep],
)
@ -153,7 +153,7 @@ if sdl_dep.found()
'export-sink.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, sdl_dep, mathlib],
)
endif

View File

@ -15,7 +15,7 @@ pipewire_ext_headers = [
]
install_headers(pipewire_ext_sm_headers,
subdir : join_paths(pipewire_headers_dir, 'extensions', 'session-manager'))
subdir : pipewire_headers_dir / 'extensions' / 'session-manager')
install_headers(pipewire_ext_headers,
subdir : join_paths(pipewire_headers_dir, 'extensions'))
subdir : pipewire_headers_dir / 'extensions')

View File

@ -165,7 +165,7 @@ test('pw-test-protocol-native',
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec', join_paths(installed_tests_execdir, 'pw-test-protocol-native'))
test_conf.set('exec', installed_tests_execdir / 'pw-test-protocol-native')
configure_file(
input: installed_tests_template,
output: 'pw-test-protocol-native.test',

View File

@ -78,7 +78,7 @@ pipewire_sources = [
configure_file(input : 'version.h.in',
output : 'version.h',
install_dir : join_paths(get_option('includedir'), pipewire_headers_dir),
install_dir : get_option('includedir') / pipewire_headers_dir,
configuration : cdata)

View File

@ -25,7 +25,7 @@ foreach a : test_apps
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec', join_paths(installed_tests_execdir, 'pw-' + a))
test_conf.set('exec', installed_tests_execdir / 'pw-' + a)
configure_file(
input: installed_tests_template,
output: 'pw-' + a + '.test',
@ -45,7 +45,7 @@ test('pw-test-cpp', test_cpp)
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec', join_paths(installed_tests_execdir, 'pw-test-cpp'))
test_conf.set('exec', installed_tests_execdir / 'pw-test-cpp')
configure_file(
input: installed_tests_template,
output: 'pw-test-cpp.test',

View File

@ -50,7 +50,7 @@ if not get_option('pw-cat').disabled() and sndfile_dep.found()
)
foreach alias : pwcat_aliases
dst = join_paths(pipewire_bindir, alias)
dst = pipewire_bindir / alias
cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pw-cat', dst)
meson.add_install_script('sh', '-c', cmd)
endforeach