From 96cd064214aa4f190a06a9aea59b919722e98ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Mon, 2 Jan 2023 23:00:53 +0000
Subject: Documentation: Specify Doxygen OUTPUT_DIRECTORY explicitly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 <pobrn@protonmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Documentation/Doxyfile.in | 2 +-
Documentation/meson.build | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
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',
--
cgit v1.2.1