From b23e2c1987e41f5fc715ceef9ba526a8216904e6 Mon Sep 17 00:00:00 2001 From: Victor Westerhuis Date: Sat, 19 Nov 2022 23:12:02 +0100 Subject: [PATCH] Do not embed build directory in documentation This makes the documentation build reproducibly. Gbp-Pq: Name 0009-Do-not-embed-build-directory-in-documentation.patch --- doc/CMakeLists.txt | 4 +++- doc/Doxyfile.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index c19fe96..4068514 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -27,6 +27,7 @@ if(DOXYGEN_FOUND) # gathering headers set(paths_include) + set(paths_source) set(paths_doc) set(paths_bib) set(paths_sample) @@ -63,6 +64,7 @@ if(DOXYGEN_FOUND) endif() endif() endif() + list(APPEND paths_source "${OPENCV_MODULE_opencv_${m}_LOCATION}/src") # doc folder set(docs_dir "${OPENCV_MODULE_opencv_${m}_LOCATION}/doc") if(EXISTS "${docs_dir}") @@ -166,7 +168,7 @@ if(DOXYGEN_FOUND) string(REPLACE ";" " " CMAKE_DOXYGEN_ENABLED_SECTIONS "${CMAKE_DOXYGEN_ENABLED_SECTIONS}") # TODO: remove paths_doc from EXAMPLE_PATH after face module tutorials/samples moved to separate folders string(REPLACE ";" " \\\n" CMAKE_DOXYGEN_EXAMPLE_PATH "${example_path} ; ${paths_doc} ; ${paths_sample}") - string(REPLACE ";" " \\\n" CMAKE_DOXYGEN_INCLUDE_ROOTS "${paths_include}") + string(REPLACE ";" " \\\n" CMAKE_DOXYGEN_INCLUDE_ROOTS "${paths_include} ; ${paths_source}") set(CMAKE_DOXYGEN_LAYOUT "${CMAKE_CURRENT_BINARY_DIR}/DoxygenLayout.xml") set(CMAKE_DOXYGEN_OUTPUT_PATH "doxygen") set(CMAKE_DOXYGEN_MAIN_REFERENCE "${refs_main}") diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index ce207d3..91cfb4c 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -22,7 +22,7 @@ ABBREVIATE_BRIEF = "The $name class" \ ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = YES -STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@/modules @CMAKE_DOXYGEN_INCLUDE_ROOTS@ +STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@/modules @OPENCV_EXTRA_MODULES_PATH@ @CMAKE_SOURCE_DIR@/doc @CMAKE_BINARY_DIR@ @CMAKE_DOXYGEN_INCLUDE_ROOTS@ STRIP_FROM_INC_PATH = @CMAKE_DOXYGEN_INCLUDE_ROOTS@ SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO -- 2.30.2