From 61885d2df00b708103868b05b7c4bd1e7e8fc680 Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Wed, 11 Nov 2015 22:38:38 +0300 Subject: [PATCH] Upgrade Doxygen configuration This change corrects an incorrect parsing of header files without an extension when used doxygen larger 1.8.3.1 --- doc/Doxyfiles/all_Doxyfile | 1 + doc/Doxyfiles/auto_Doxyfile | 1 + doc/Doxyfiles/auto_Mainpage | 19 +++++++++++++++++++ doc/Doxyfiles/core_Doxyfile | 1 + doc/Doxyfiles/doxyfile.cmake | 1 + doc/Doxyfiles/openthreads.doxyfile.cmake | 1 + 6 files changed, 24 insertions(+) diff --git a/doc/Doxyfiles/all_Doxyfile b/doc/Doxyfiles/all_Doxyfile index 3db1a42d1..69bf37e6d 100644 --- a/doc/Doxyfiles/all_Doxyfile +++ b/doc/Doxyfiles/all_Doxyfile @@ -39,6 +39,7 @@ OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO +EXTENSION_MAPPING = no_extension=C++ BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO diff --git a/doc/Doxyfiles/auto_Doxyfile b/doc/Doxyfiles/auto_Doxyfile index 3145194b8..99a9bd868 100644 --- a/doc/Doxyfiles/auto_Doxyfile +++ b/doc/Doxyfiles/auto_Doxyfile @@ -39,6 +39,7 @@ OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO +EXTENSION_MAPPING = no_extension=C++ BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO diff --git a/doc/Doxyfiles/auto_Mainpage b/doc/Doxyfiles/auto_Mainpage index 496bfe1a4..26dcdb45f 100644 --- a/doc/Doxyfiles/auto_Mainpage +++ b/doc/Doxyfiles/auto_Mainpage @@ -169,6 +169,25 @@ OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = no_extension=C++ + # Set the SUBGROUPING tag to YES (the default) to allow class member groups of # the same type (for instance a group of public functions) to be put as a # subgroup of that type (e.g. under the Public Functions section). Set it to diff --git a/doc/Doxyfiles/core_Doxyfile b/doc/Doxyfiles/core_Doxyfile index d5250876b..373e1b685 100644 --- a/doc/Doxyfiles/core_Doxyfile +++ b/doc/Doxyfiles/core_Doxyfile @@ -29,6 +29,7 @@ OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO +EXTENSION_MAPPING = no_extension=C++ BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO diff --git a/doc/Doxyfiles/doxyfile.cmake b/doc/Doxyfiles/doxyfile.cmake index 61520665a..8ee7fc5fc 100644 --- a/doc/Doxyfiles/doxyfile.cmake +++ b/doc/Doxyfiles/doxyfile.cmake @@ -29,6 +29,7 @@ OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO +EXTENSION_MAPPING = no_extension=C++ BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO diff --git a/doc/Doxyfiles/openthreads.doxyfile.cmake b/doc/Doxyfiles/openthreads.doxyfile.cmake index 5cf753cc2..4fbeac27e 100644 --- a/doc/Doxyfiles/openthreads.doxyfile.cmake +++ b/doc/Doxyfiles/openthreads.doxyfile.cmake @@ -29,6 +29,7 @@ OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO +EXTENSION_MAPPING = no_extension=C++ BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO