From patchwork Mon Dec 7 15:07:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 10593 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id EAF4EBDB20 for ; Mon, 7 Dec 2020 15:07:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8965967E50; Mon, 7 Dec 2020 16:07:45 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="NoAsvJPO"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C0EDA63546 for ; Mon, 7 Dec 2020 16:07:43 +0100 (CET) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3B1F645D; Mon, 7 Dec 2020 16:07:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1607353663; bh=/kn+pKO4x3p1qU1XkKJYYUy+lbyjJNEc6gXfnPstHNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NoAsvJPOnRIyAJokj0NjRAGqVa/yr0ojckbijkxieq3gQUOeA2ZbojuXkAzwUgxMi IBFuolsF1bTC6Tz4GqPvlLpAq5VXf9uPHjnnWmH1ZWzb/npVF+XFkea+IgK4LeLOD7 zxYQrA724sfLZu+ZqFDt5SVs9UU75cuFMJR1jTp0= From: Kieran Bingham To: libcamera devel Date: Mon, 7 Dec 2020 15:07:34 +0000 Message-Id: <20201207150737.307692-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201207150737.307692-1-kieran.bingham@ideasonboard.com> References: <20201207150737.307692-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/4] src: meson: Re-order subdir layout X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- 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')