# HG changeset patch # User Alpar Juttner # Date 1375705318 -7200 # Node ID 218171dc022d194408f71d4dd290c5b0fb21dd44 # Parent 97d97824370316f3524235c8c4d5eeb72ece87f7 Doxygen config improvements (#459) - remove an erroneous line from DoxygenLayout.xml - libstdc++ doxygen tagfile version is configurable - use fixed gcc doc version (4.7.3) instead of the latest one diff -r 97d978243703 -r 218171dc022d doc/CMakeLists.txt --- a/doc/CMakeLists.txt Mon Aug 05 14:03:29 2013 +0200 +++ b/doc/CMakeLists.txt Mon Aug 05 14:21:58 2013 +0200 @@ -7,6 +7,11 @@ SET(LEMON_DOC_USE_MATHJAX "NO" CACHE STRING "Use MathJax to display math formulae (YES/NO).") SET(LEMON_DOC_MATHJAX_RELPATH "http://www.mathjax.org/mathjax" CACHE STRING "MathJax library location.") +SET(LEMON_DOC_LIBSTDC++_URL + "http://gcc.gnu.org/onlinedocs/gcc-4.7.3/libstdc++/api" + CACHE STRING "GCC libstdc++ doxygen doc url.") + + CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in ${PROJECT_BINARY_DIR}/doc/Doxyfile @@ -75,7 +80,7 @@ IF(WGET_FOUND) ADD_CUSTOM_TARGET(update-external-tags - COMMAND ${WGET_EXECUTABLE} -N http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag + COMMAND ${WGET_EXECUTABLE} -N ${LEMON_DOC_LIBSTDC++_URL}/libstdc++.tag WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) ENDIF() diff -r 97d978243703 -r 218171dc022d doc/Doxyfile.in --- a/doc/Doxyfile.in Mon Aug 05 14:03:29 2013 +0200 +++ b/doc/Doxyfile.in Mon Aug 05 14:21:58 2013 +0200 @@ -253,7 +253,7 @@ #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = "@abs_top_builddir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/ " +TAGFILES = "@abs_top_builddir@/doc/libstdc++.tag = @LEMON_DOC_LIBSTDC++_URL@" GENERATE_TAGFILE = html/lemon.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = NO diff -r 97d978243703 -r 218171dc022d doc/DoxygenLayout.xml --- a/doc/DoxygenLayout.xml Mon Aug 05 14:03:29 2013 +0200 +++ b/doc/DoxygenLayout.xml Mon Aug 05 14:21:58 2013 +0200 @@ -17,7 +17,6 @@ -