From e3a2eb8f23c9ebbeb824bb80c075277d6394617f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 10 Jan 2022 11:29:46 +0100 Subject: [PATCH 1/2] update default --- Documentation/doc/CMakeLists.txt | 2 +- Documentation/doc/resources/1.9.3/BaseDoxyfile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/doc/CMakeLists.txt b/Documentation/doc/CMakeLists.txt index 5ff79cbed2c..a695aaed2f6 100644 --- a/Documentation/doc/CMakeLists.txt +++ b/Documentation/doc/CMakeLists.txt @@ -252,7 +252,7 @@ set(CGAL_DOC_DXY_DIR "${CMAKE_BINARY_DIR}/doc_dxy") file(MAKE_DIRECTORY "${CGAL_DOC_DXY_DIR}") #Setting the resource directory depending on the version of doxygen -set(CGAL_DOC_RESOURCE_DIR_DEFAULT "${CMAKE_CURRENT_LIST_DIR}/resources/1.8.20") +set(CGAL_DOC_RESOURCE_DIR_DEFAULT "${CMAKE_CURRENT_LIST_DIR}/resources/1.9.3") # first look if resources for the specific doxygen version is available, fallback # on the default otherwise diff --git a/Documentation/doc/resources/1.9.3/BaseDoxyfile.in b/Documentation/doc/resources/1.9.3/BaseDoxyfile.in index 960e9dafb10..a6ab626114b 100644 --- a/Documentation/doc/resources/1.9.3/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.9.3/BaseDoxyfile.in @@ -1,4 +1,4 @@ -# Doxyfile 1.8.20 +# Doxyfile 1.9.3 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. From 1a0ef7883e462eafb18206ac147b1708e7f4c435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 11 Jan 2022 12:39:57 +0100 Subject: [PATCH 2/2] add missing \cond --- BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h | 1 + 1 file changed, 1 insertion(+) diff --git a/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h b/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h index 9575c2a8c6e..0c627fb9f41 100644 --- a/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h +++ b/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h @@ -688,6 +688,7 @@ double alpha_expansion_graphcut (const InputGraph& input_graph, return min_cut; } +/// \cond SKIP_IN_MANUAL /// \cond SKIP_IN_MANUAL // variant with default NP