songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6230 from sloriot/CGAL-doxy_default 

Update latest default
This commit is contained in:
Laurent Rineau 2022-01-12 11:41:26 +01:00
parent 314b94aafa 1a0ef7883e
commit 20cdd62d07
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h
View File

@ -660,6 +660,7 @@ double alpha_expansion_graphcut (const InputGraph& input_graph,
return min_cut; return min_cut;
} }
/// \cond SKIP_IN_MANUAL
/// \cond SKIP_IN_MANUAL /// \cond SKIP_IN_MANUAL
// variant with default NP // variant with default NP

2
Documentation/doc/CMakeLists.txt
View File

@ -252,7 +252,7 @@ set(CGAL_DOC_DXY_DIR "${CMAKE_BINARY_DIR}/doc_dxy")
file(MAKE_DIRECTORY "${CGAL_DOC_DXY_DIR}") file(MAKE_DIRECTORY "${CGAL_DOC_DXY_DIR}")
#Setting the resource directory depending on the version of doxygen #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 # first look if resources for the specific doxygen version is available, fallback
# on the default otherwise # on the default otherwise

2
Documentation/doc/resources/1.9.3/BaseDoxyfile.in
View File

@ -1,4 +1,4 @@
# Doxyfile 1.8.20 # Doxyfile 1.9.3
# This file describes the settings to be used by the documentation system # This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project. # doxygen (www.doxygen.org) for a project.