summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ipa/meson.build2
-rw-r--r--src/py/libcamera/meson.build16
-rw-r--r--src/py/meson.build12
3 files changed, 13 insertions, 17 deletions
diff --git a/src/ipa/meson.build b/src/ipa/meson.build
index 0ad4631d..68f64b9a 100644
--- a/src/ipa/meson.build
+++ b/src/ipa/meson.build
@@ -4,7 +4,7 @@ ipa_includes = [
libcamera_includes,
]
-ipa_install_dir = libcamera_libdir
+ipa_install_dir = libcamera_libdir / 'ipa'
ipa_data_dir = libcamera_datadir / 'ipa'
ipa_sysconf_dir = libcamera_sysconfdir / 'ipa'
diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build
index 596a203c..0b38b124 100644
--- a/src/py/libcamera/meson.build
+++ b/src/py/libcamera/meson.build
@@ -1,21 +1,5 @@
# SPDX-License-Identifier: CC0-1.0
-py3_dep = dependency('python3', required : get_option('pycamera'))
-
-if not py3_dep.found()
- pycamera_enabled = false
- subdir_done()
-endif
-
-pybind11_dep = dependency('pybind11', required : get_option('pycamera'))
-
-if not pybind11_dep.found()
- pycamera_enabled = false
- subdir_done()
-endif
-
-pycamera_enabled = true
-
pycamera_sources = files([
'py_camera_manager.cpp',
'py_color_space.cpp',
diff --git a/src/py/meson.build b/src/py/meson.build
index a4586b4a..92280697 100644
--- a/src/py/meson.build
+++ b/src/py/meson.build
@@ -1,3 +1,15 @@
# SPDX-License-Identifier: CC0-1.0
+py3_dep = dependency('python3', required : get_option('pycamera'))
+pybind11_dep = dependency('pybind11', required : get_option('pycamera'))
+
+pycamera_enabled = py3_dep.found() and pybind11_dep.found()
+if not pycamera_enabled
+ subdir_done()
+endif
+
subdir('libcamera')
+
+pycamera_devenv = environment()
+pycamera_devenv.prepend('PYTHONPATH', meson.current_build_dir())
+meson.add_devenv(pycamera_devenv)