From patchwork Mon Jan 2 23:00:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 18081 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 F22D7BD78E for ; Mon, 2 Jan 2023 23:01:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4B68A61F0E; Tue, 3 Jan 2023 00:01:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1672700465; bh=rnvC/0HDLRFRZ7oT+Nvf8TrPqeV0d7sB6J4pssggub0=; h=Date:To:List-Id:List-Post:From:List-Subscribe:List-Unsubscribe: List-Archive:Reply-To:List-Help:Subject:From; b=U4fRlSMewVuzHrC6c6MLM5z/ceu53PUVeMqDoMtslhgzNXbWqjlt2E+TFRHHKpDFe bx7qYaWCopSUvMgKBuJ+SM3NQPzNUOR5DrZO2NIiiimChJWoS97sOvPhY/cP7kLjDu uy1Ksf5pHWgHEha+9RtVUDs303bne373CIlWBd0P6Xx0l9tyhguyPwbjsS4lODUX7b dTlEEG2t6jMC8dSkoslfCkSM0uLmtCBob5FHWt3NEq50N0DdJcVqDmcItf6Vm+eeen 9AI7PX3Fs8Cp1VPLrgAgFsu6Bm6fPwgGuAcEX1hJak1TZg8JjOuUP0kttM5esodj28 BM634WOmOFnpQ== Date: Mon, 02 Jan 2023 23:00:53 +0000 To: libcamera-devel@lists.libcamera.org MIME-Version: 1.0 Message-ID: List-Id: List-Post: X-Patchwork-Original-From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze_via_libcamera-devel?= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= Precedence: list X-Mailman-Version: 2.1.29 X-BeenThere: libcamera-devel@lists.libcamera.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= List-Help: Subject: [libcamera-devel] [PATCH v1] Documentation: specify Doxygen OUTPUT_DIRECTORY explicitly Content-Disposition: inline Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Currently, doxygen is run by ninja in the top-level build directory, therefore the "Documentation" folder is always created there. However, when libcamera is built as a subproject, it should not touch the top-level build directory because it can cause conflicts and because the documentation won't be created where meson thinks it will be, so the "doxygen" target will always be dirty and installation will fail. Signed-off-by: Barnabás Pőcze --- Documentation/Doxyfile.in | 2 +- Documentation/meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.39.0 diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in index e4f0cd42..1447abdb 100644 --- a/Documentation/Doxyfile.in +++ b/Documentation/Doxyfile.in @@ -5,7 +5,7 @@ PROJECT_NAME = "libcamera" PROJECT_NUMBER = "@VERSION@" PROJECT_BRIEF = "Supporting cameras in Linux since 2019" -OUTPUT_DIRECTORY = Documentation +OUTPUT_DIRECTORY = "@OUTPUT_DIR@" STRIP_FROM_PATH = "@TOP_SRCDIR@" diff --git a/Documentation/meson.build b/Documentation/meson.build index 7695bcb1..18646156 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -14,6 +14,7 @@ if doxygen.found() and dot.found() cdata.set('VERSION', 'v@0@'.format(libcamera_git_version)) cdata.set('TOP_SRCDIR', meson.project_source_root()) cdata.set('TOP_BUILDDIR', meson.project_build_root()) + cdata.set('OUTPUT_DIR', meson.current_build_dir()) doxyfile = configure_file(input : 'Doxyfile.in', output : 'Doxyfile',