From patchwork Wed Oct 19 23:15:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 17648 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 28E98C0DA4 for ; Wed, 19 Oct 2022 23:16:13 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D408162E88; Thu, 20 Oct 2022 01:16:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1666221372; bh=JgLFQNzIPIcxyqgtZh5197RCEK8oDH5JtjYJET0ajaA=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=kzyvjoReY8wa/NHR8eyPMQDfs9mA1pZEdDyrLnsrUt3Xx/u7W5rMRKFdE859u6nIa YkoHPfZz6NJC/EDI+aOxVOiOuOH1cu04lwRTUmyoKpxH5JkKzv76u5qdexgJDB5Cbr +9WuBX4Rm+hSXoEZ/AIkYMw7NM7HjzSzOo7fQ/ysyWIrxdegl1ugp4SxoEPw+T6Dzi CX3Lu4quhoCMYoiNVI5DqOkooj1SivT0c03PplshDw+E3d7UEavNVMo3QHucKnknKN hSmMtTtj5h9J2XUdMfyoP8kvCfio7+sjJGJvxWvW9DMd8uKty77cchujb6QNyMGGBo NkbSbVKItG31A== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AC3B562E85 for ; Thu, 20 Oct 2022 01:16:10 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="b04G2RFf"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 05191570 for ; Thu, 20 Oct 2022 01:16:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1666221370; bh=JgLFQNzIPIcxyqgtZh5197RCEK8oDH5JtjYJET0ajaA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=b04G2RFfKCh9oXRFqqkZgYIltCxecVW3Rucac5KjHbiSdzVovujJowAH5gBrVtpCQ P+Y1nvH5vupEJ6Vo7a1kDQaUHTPRZ7Un2AG+hPQFQq0qNXXUcYrnp57rrnw2fkfDkk ZB14TbqF+ijtrWxDFicylCyxhr3DsMgLBu95LK6Q= To: libcamera-devel@lists.libcamera.org Date: Thu, 20 Oct 2022 02:15:35 +0300 Message-Id: <20221019231537.26880-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221019231537.26880-1-laurent.pinchart@ideasonboard.com> References: <20221019231537.26880-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 4/6] apps: Move libevent dependency to src/apps/meson.build 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: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" libtiff is a shared dependency between cam and lc-compliance, move it to src/apps/. The shared dependency will be used to condition compilation of source files in an upcoming application static library. Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham --- src/apps/cam/meson.build | 4 +--- src/apps/lc-compliance/meson.build | 3 +-- src/apps/meson.build | 8 ++++++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/apps/cam/meson.build b/src/apps/cam/meson.build index 06dbea0645b7..4b6099ddab63 100644 --- a/src/apps/cam/meson.build +++ b/src/apps/cam/meson.build @@ -1,8 +1,6 @@ # SPDX-License-Identifier: CC0-1.0 -libevent = dependency('libevent_pthreads', required : get_option('cam')) - -if not libevent.found() +if opt_cam.disabled() or not libevent.found() cam_enabled = false subdir_done() endif diff --git a/src/apps/lc-compliance/meson.build b/src/apps/lc-compliance/meson.build index 8b57474be2b2..05d622be0a40 100644 --- a/src/apps/lc-compliance/meson.build +++ b/src/apps/lc-compliance/meson.build @@ -1,10 +1,9 @@ # SPDX-License-Identifier: CC0-1.0 -libevent = dependency('libevent_pthreads', required : get_option('lc-compliance')) libgtest = dependency('gtest', required : get_option('lc-compliance'), fallback : ['gtest', 'gtest_dep']) -if not (libevent.found() and libgtest.found()) +if opt_lc_compliance.disabled() or not libevent.found() or not libgtest.found() lc_compliance_enabled = false subdir_done() endif diff --git a/src/apps/meson.build b/src/apps/meson.build index 9e4388bd7881..159deb0b7fc2 100644 --- a/src/apps/meson.build +++ b/src/apps/meson.build @@ -1,5 +1,13 @@ # SPDX-License-Identifier: CC0-1.0 +opt_cam = get_option('cam') +opt_lc_compliance = get_option('lc-compliance') + +libevent = dependency('libevent_pthreads', required : opt_cam) +if not libevent.found() + libevent = dependency('libevent_pthreads', required : opt_lc_compliance) +endif + subdir('lc-compliance') subdir('cam')