[libcamera-devel,v1] Documentation: specify Doxygen OUTPUT_DIRECTORY explicitly
diff mbox series

Message ID mailman.0.1672700464.775.libcamera-devel@lists.libcamera.org
State Accepted
Headers show
Series
  • [libcamera-devel,v1] Documentation: specify Doxygen OUTPUT_DIRECTORY explicitly
Related show

Commit Message

Barnabás Pőcze Jan. 2, 2023, 11 p.m. UTC 
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>
---
 Documentation/Doxyfile.in | 2 +-
 Documentation/meson.build | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--
2.39.0

Patch
diff mbox series 

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',