646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
98 lines
3.0 KiB
Diff
98 lines
3.0 KiB
Diff
From 37687a195052186432923276bc2c2358b3622ab1 Mon Sep 17 00:00:00 2001
|
|
From: OPNA2608 <opna2608@protonmail.com>
|
|
Date: Thu, 16 Jan 2025 17:12:44 +0100
|
|
Subject: [PATCH 2/5] Re-enable documentation
|
|
|
|
---
|
|
CMakeLists.txt | 6 +++++-
|
|
debian/liblomiri-thumbnailer-qt-doc.install | 1 +
|
|
...lomiri-thumbnailer-qt-doc.install.disabled | 1 -
|
|
doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 21 ++++++++-----------
|
|
4 files changed, 15 insertions(+), 14 deletions(-)
|
|
create mode 100644 debian/liblomiri-thumbnailer-qt-doc.install
|
|
delete mode 100644 debian/liblomiri-thumbnailer-qt-doc.install.disabled
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 464ac70..cade10f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -184,7 +184,11 @@ if (${BUILD_TESTING})
|
|
endif()
|
|
add_subdirectory(include)
|
|
add_subdirectory(man)
|
|
-#add_subdirectory(doc)
|
|
+
|
|
+option(ENABLE_DOC "Build documentation" ON)
|
|
+if(ENABLE_DOC)
|
|
+ add_subdirectory(doc)
|
|
+endif()
|
|
|
|
#enable_coverage_report(
|
|
# TARGETS
|
|
diff --git a/debian/liblomiri-thumbnailer-qt-doc.install b/debian/liblomiri-thumbnailer-qt-doc.install
|
|
new file mode 100644
|
|
index 0000000..ff56aee
|
|
--- /dev/null
|
|
+++ b/debian/liblomiri-thumbnailer-qt-doc.install
|
|
@@ -0,0 +1 @@
|
|
+usr/share/doc/lomiri-thumbnailer/*
|
|
diff --git a/debian/liblomiri-thumbnailer-qt-doc.install.disabled b/debian/liblomiri-thumbnailer-qt-doc.install.disabled
|
|
deleted file mode 100644
|
|
index db055cf..0000000
|
|
--- a/debian/liblomiri-thumbnailer-qt-doc.install.disabled
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-usr/share/doc/liblomiri-thumbnailer-qt/*
|
|
diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
|
index 3e96f80..fe98e4c 100644
|
|
--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
|
+++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
|
@@ -1,35 +1,32 @@
|
|
-include(UseDoxygen OPTIONAL)
|
|
+find_package(DoxygenBuilder REQUIRED)
|
|
|
|
file(GLOB libthumbnailer_headers "${PROJECT_SOURCE_DIR}/include/lomiri/thumbnailer/qt/*.h")
|
|
|
|
add_doxygen(
|
|
liblomiri-thumbnailer-qt-doc
|
|
+ PROJECT_NAME
|
|
+ "Thumbnailer Qt API"
|
|
INPUT
|
|
${CMAKE_CURRENT_SOURCE_DIR}/tutorial.dox
|
|
${libthumbnailer_headers}
|
|
- OUTPUT_DIRECTORY
|
|
- ${CMAKE_BINARY_DIR}/doc/liblomiri-thumbnailer-qt
|
|
+ EXAMPLE_PATH
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}
|
|
STRIP_FROM_PATH
|
|
"${CMAKE_SOURCE_DIR}/src"
|
|
STRIP_FROM_INC_PATH
|
|
"${CMAKE_SOURCE_DIR}/include"
|
|
+ DOXYFILE_IN
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
|
|
EXCLUDE_PATTERNS
|
|
*/internal/*
|
|
EXCLUDE_SYMBOLS
|
|
*::internal*
|
|
*::Priv
|
|
- EXAMPLE_PATH
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}
|
|
- DOXYFILE_IN
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
|
|
- PROJECT_NAME
|
|
- "Thumbnailer Qt API"
|
|
+ INSTALL
|
|
+ ${CMAKE_INSTALL_DOCDIR}
|
|
ALL
|
|
)
|
|
|
|
-install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html
|
|
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
|
-
|
|
add_subdirectory(examples)
|
|
|
|
list(APPEND UNIT_TEST_TARGETS qt_example_test)
|
|
--
|
|
2.47.0
|
|
|