[libcamera-devel] [PATCH 1/4] src: meson: Re-order subdir layout
Kieran Bingham
kieran.bingham at ideasonboard.com
Mon Dec 7 16:07:34 CET 2020
Move the android subdir below the configuration options to keep all
subdirs together.
Add a comment explaining why android must come first, and some padding
to group the libcamera and ipa components, applications, and remaining
adaptation layers.
Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
src/meson.build | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index b9c7e7599d61..8e219943acb8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: CC0-1.0
-subdir('android')
-
openssl = find_program('openssl', required : true)
if openssl.found()
ipa_priv_key = custom_target('ipa-priv-key',
@@ -13,8 +11,13 @@ else
ipa_sign_module = false
endif
+# The 'android' subdir must be processed first, and the build targets
+# are included directly into the libcamera library when this is enabled.
+subdir('android')
+
subdir('libcamera')
subdir('ipa')
+
subdir('cam')
subdir('qcam')
--
2.25.1
More information about the libcamera-devel
mailing list