From patchwork Wed Oct 27 23:00:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 14527 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by patchwork.libcamera.org (Postfix) with ESMTPS id B4F9DBDB1C for ; Wed, 10 Nov 2021 14:02:43 +0000 (UTC) Received: from pendragon.ideasonboard.com (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 36474501 for ; Wed, 10 Nov 2021 15:02:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1636552963; bh=IkjsaVC+TF1Y88oB+1SnMMSrHkHXT9WDkJYgV87hxjo=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Resent-From:Resent-To:From; b=d3EE5CVki9DqtPiRPMAHdfaEklvAf+0thSkCS3M3p4W/cKOwhTOqnNspUZDhB34MV idblhE2IYYNagPscG3Lz5DeZFsSSPN52oPR9l9v6wOdbmCHXU2/Gas5/MkUtze0YdZ kUBJhPx4imKUU4cYnbzc8n7Ibkq/iN1IXFABGwYE= Delivered-To: kbingham@ideasonboard.com Received: from perceval.ideasonboard.com by perceval.ideasonboard.com with LMTP id IL13MhHaeWH/NwAA4E0KoQ (envelope-from ) for ; Thu, 28 Oct 2021 01:00:33 +0200 Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by perceval.ideasonboard.com (Postfix) with ESMTPS id B907A276; Thu, 28 Oct 2021 01:00:33 +0200 (CEST) Authentication-Results: perceval.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="kwDGedCL"; dkim-atps=neutral Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 772A16487F; Thu, 28 Oct 2021 01:00:33 +0200 (CEST) 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="kwDGedCL"; 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 CAB6660128 for ; Thu, 28 Oct 2021 01:00:31 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6B876276 for ; Thu, 28 Oct 2021 01:00:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1635375631; bh=IkjsaVC+TF1Y88oB+1SnMMSrHkHXT9WDkJYgV87hxjo=; h=From:To:Subject:Date:From; b=kwDGedCLyF/7qBYyvpXUtK7TVrhKvKFRWFPqs/iV5ff8JCpGQpyUknfxTQtA+miZP Rxk/9dWwx2MhTD+Gr+M/543arhKujJt2EhciWfqs1YOcXv4ivueBhlZm27HwUtlTVA 7dRXOqmPPO8mn67TIMLeE0StjGn7TCXxmfWVZR4w= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Thu, 28 Oct 2021 02:00:05 +0300 Message-Id: <20211027230005.10649-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] Documentation: Fixed build when the IPU3 pipeline handler is disabled 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" X-TUID: CW4ZYe/rPrvk Resent-From: Kieran Bingham Resent-To: parsemail@patchwork.libcamera.org When the IPU3 pipeline handler is disabled, the corresponding IPA module isn't compiled, which results in the meson ipu3_ipa_sources variable to be undefined. The variable is used unconditionally as part of the Doxygen inputs, so Meson complains at configuration time that it is undefined. Fix it by including the IPU3 IPA documentation in the Doxygen build only when the IPU3 pipeline handler is enabled. Fixes: 45dd51988952 ("Documentation: Include IPU3 in Doxygen build") Signed-off-by: Laurent Pinchart --- Documentation/meson.build | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) base-commit: 76bd9f3d80cb99a3391832b644b65a619427ed00 diff --git a/Documentation/meson.build b/Documentation/meson.build index df36a808dfb5..4c9726754a92 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -19,20 +19,25 @@ if doxygen.found() and dot.found() output : 'Doxyfile', configuration : cdata) + doxygen_input = [ + doxyfile, + libcamera_base_headers, + libcamera_base_sources, + libcamera_internal_headers, + libcamera_ipa_headers, + libcamera_ipa_interfaces, + libcamera_public_headers, + libcamera_sources, + libipa_headers, + libipa_sources, + ] + + if is_variable('ipu3_ipa_sources') + doxygen_input += [ipu3_ipa_sources] + endif + custom_target('doxygen', - input : [ - doxyfile, - ipu3_ipa_sources, - libcamera_base_headers, - libcamera_base_sources, - libcamera_internal_headers, - libcamera_ipa_headers, - libcamera_ipa_interfaces, - libcamera_public_headers, - libcamera_sources, - libipa_headers, - libipa_sources, - ], + input : doxygen_input, output : 'api-html', command : [doxygen, doxyfile], install : true,