From patchwork Wed Oct 19 23:15:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 17646 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 12F9DC0DA4 for ; Wed, 19 Oct 2022 23:16:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B9D6062E71; Thu, 20 Oct 2022 01:16:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1666221369; bh=lE+WqI5w4josPytAHH2TvdMCzvVO/4yTMximU3OglRE=; 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=QYDDOLa/oQNeqyB3iibY8ZxVMDLDDVxTLd6eazVuJY6mYoo3G+Pd2UPd/9yOZ5gwb OG3D0TTdOFDc7Lzda5ePS3CgeCDtFYFMokXxOJrq+8zPD/J07I9EvY+YrUUF5XFZAE TyH8puGC3HqHaoHRY80Lx+QxvpPKgfeWqGCdLcZgObLH7/xTPUyWUJAjy8QPjmGMID T7KsygG5t3LC8VhYufnb4/Dr25vdBgAidIYmvMqFxIfQio1e1UDMPsfAJjIukk4FSv dqKFyp49txW9nNenCd4SmaQ/89CCx3S7aFcCSDK8cAyow/AolLUTj7H9oi9X0Df4f1 rTS6im1im/kaw== 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 7D4B962E6E for ; Thu, 20 Oct 2022 01:16:06 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MGO39oFN"; 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 0B4BF570 for ; Thu, 20 Oct 2022 01:16:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1666221366; bh=lE+WqI5w4josPytAHH2TvdMCzvVO/4yTMximU3OglRE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=MGO39oFNDg//0uqayUCT/W51C6Ejtsw0SLfgkMjONr3sB0sHNvtEEFOShaF3ZrirK 1hBDBZu9uw7cIuShS3XOkj1F42HRxj3Zf1jY4kPH1JotqeSn8UcvdwmsiWmSTteG4e TbAAUtYTMjPJbNMVaDX849binglB6TAYMeNz7qEs= To: libcamera-devel@lists.libcamera.org Date: Thu, 20 Oct 2022 02:15:33 +0300 Message-Id: <20221019231537.26880-3-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 2/6] qcam: Simplify dependency handling for libtiff 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" There's no need to conditionally add tiff_dep to the list of qcam dependency, as a not found dependency() is ignored when listed in the executable dependencies argument. Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham --- src/qcam/meson.build | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/qcam/meson.build b/src/qcam/meson.build index 9f5759ff0786..d5916d0df532 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -36,18 +36,11 @@ qcam_resources = files([ 'assets/feathericons/feathericons.qrc', ]) -qcam_deps = [ - libatomic, - libcamera_public, - qt5_dep, -] - qt5_cpp_args = ['-DQT_NO_KEYWORDS'] tiff_dep = dependency('libtiff-4', required : false) if tiff_dep.found() qt5_cpp_args += ['-DHAVE_TIFF'] - qcam_deps += [tiff_dep] qcam_sources += files([ '../cam/dng_writer.cpp', ]) @@ -81,5 +74,10 @@ resources = qt5.preprocess(moc_headers: qcam_moc_headers, qcam = executable('qcam', qcam_sources, resources, install : true, - dependencies : qcam_deps, + dependencies : [ + libatomic, + libcamera_public, + qt5_dep, + tiff_dep, + ], cpp_args : qt5_cpp_args)