summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ipa/meson.build2
-rw-r--r--src/ipa/raspberrypi/data/meson.build2
-rw-r--r--src/ipa/vimc/data/meson.build2
-rw-r--r--src/libcamera/meson.build2
-rw-r--r--src/libcamera/proxy/worker/meson.build4
5 files changed, 6 insertions, 6 deletions
diff --git a/src/ipa/meson.build b/src/ipa/meson.build
index b3f24f42..5b5684a1 100644
--- a/src/ipa/meson.build
+++ b/src/ipa/meson.build
@@ -28,7 +28,7 @@ ipa_names = []
foreach pipeline : pipelines
if ipas.contains(pipeline)
subdir(pipeline)
- ipa_names += join_paths(ipa_install_dir, ipa_name + '.so')
+ ipa_names += ipa_install_dir / ipa_name + '.so'
endif
endforeach
diff --git a/src/ipa/raspberrypi/data/meson.build b/src/ipa/raspberrypi/data/meson.build
index 253fb9d7..92ad3272 100644
--- a/src/ipa/raspberrypi/data/meson.build
+++ b/src/ipa/raspberrypi/data/meson.build
@@ -10,4 +10,4 @@ conf_files = files([
])
install_data(conf_files,
- install_dir : join_paths(ipa_data_dir, 'raspberrypi'))
+ install_dir : ipa_data_dir / 'raspberrypi')
diff --git a/src/ipa/vimc/data/meson.build b/src/ipa/vimc/data/meson.build
index 6532662c..42ec651c 100644
--- a/src/ipa/vimc/data/meson.build
+++ b/src/ipa/vimc/data/meson.build
@@ -5,4 +5,4 @@ conf_files = files([
])
install_data(conf_files,
- install_dir : join_paths(ipa_data_dir, 'vimc'))
+ install_dir : ipa_data_dir / 'vimc')
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 675053d4..7bc59b84 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -103,7 +103,7 @@ endforeach
libcamera_sources += control_sources
-gen_version = join_paths(meson.source_root(), 'utils', 'gen-version.sh')
+gen_version = meson.source_root() / 'utils' / 'gen-version.sh'
version_cpp = vcs_tag(command : [gen_version, meson.build_root()],
input : 'version.cpp.in',
diff --git a/src/libcamera/proxy/worker/meson.build b/src/libcamera/proxy/worker/meson.build
index 3796103e..40dada9d 100644
--- a/src/libcamera/proxy/worker/meson.build
+++ b/src/libcamera/proxy/worker/meson.build
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: CC0-1.0
-proxy_install_dir = join_paths(get_option('libexecdir'), 'libcamera')
+proxy_install_dir = get_option('libexecdir') / 'libcamera'
# generate {pipeline}_ipa_proxy_worker.cpp
foreach mojom : ipa_mojoms
@@ -25,4 +25,4 @@ foreach mojom : ipa_mojoms
endforeach
config_h.set('IPA_PROXY_DIR',
- '"' + join_paths(get_option('prefix'), proxy_install_dir) + '"')
+ '"' + get_option('prefix') / proxy_install_dir + '"')