summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-09-15 03:05:20 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-09-15 13:58:18 +0300
commitba44276dd1393fb7583ac7253667c836a175158e (patch)
tree1084d232bbf2ca60cb709ae7022551751e0dc51c
parent1e704c84a946f988c290169f060aa088d53fc4a8 (diff)
libcamera: Move list of private headers to src/libcamera/include/meson.build
The libcamera private headers are listed in src/libcamera/meson.build, while they are located in src/libcamera/include/. The lack of a meson.build in src/libcamera/include/ increases the risk of forgetting to add new headers to the libcamera_headers array. Fix it by moving it to src/libcamera/include/meson.build, and add the missing v4l2_controls.h entry. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--src/libcamera/include/meson.build24
-rw-r--r--src/libcamera/meson.build24
2 files changed, 25 insertions, 23 deletions
diff --git a/src/libcamera/include/meson.build b/src/libcamera/include/meson.build
new file mode 100644
index 00000000..933be854
--- /dev/null
+++ b/src/libcamera/include/meson.build
@@ -0,0 +1,24 @@
+libcamera_headers = files([
+ 'camera_sensor.h',
+ 'device_enumerator.h',
+ 'device_enumerator_sysfs.h',
+ 'device_enumerator_udev.h',
+ 'event_dispatcher_poll.h',
+ 'formats.h',
+ 'ipa_manager.h',
+ 'ipa_module.h',
+ 'ipa_proxy.h',
+ 'ipc_unixsocket.h',
+ 'log.h',
+ 'media_device.h',
+ 'media_object.h',
+ 'message.h',
+ 'pipeline_handler.h',
+ 'process.h',
+ 'thread.h',
+ 'utils.h',
+ 'v4l2_controls.h',
+ 'v4l2_device.h',
+ 'v4l2_subdevice.h',
+ 'v4l2_videodevice.h',
+])
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 0916bc41..755149c5 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -36,29 +36,7 @@ libcamera_sources = files([
'v4l2_videodevice.cpp',
])
-libcamera_headers = files([
- 'include/camera_sensor.h',
- 'include/device_enumerator.h',
- 'include/device_enumerator_sysfs.h',
- 'include/device_enumerator_udev.h',
- 'include/event_dispatcher_poll.h',
- 'include/formats.h',
- 'include/ipa_manager.h',
- 'include/ipa_module.h',
- 'include/ipa_proxy.h',
- 'include/ipc_unixsocket.h',
- 'include/log.h',
- 'include/media_device.h',
- 'include/media_object.h',
- 'include/message.h',
- 'include/pipeline_handler.h',
- 'include/process.h',
- 'include/thread.h',
- 'include/utils.h',
- 'include/v4l2_device.h',
- 'include/v4l2_subdevice.h',
- 'include/v4l2_videodevice.h',
-])
+subdir('include')
libcamera_internal_includes = include_directories('include')