[Lemon-commits] Alpar Juttner: Doxygen config improvements (#459)

Lemon HG hg at lemon.cs.elte.hu
Mon Aug 5 15:03:56 CEST 2013


details:   http://lemon.cs.elte.hu/hg/lemon/rev/218171dc022d
changeset: 1247:218171dc022d
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Mon Aug 05 14:21:58 2013 +0200
description:
	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

diffstat:

 doc/CMakeLists.txt    |  7 ++++++-
 doc/Doxyfile.in       |  2 +-
 doc/DoxygenLayout.xml |  1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diffs (47 lines):

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 @@
       <tab type="files" visible="yes" title="" intro=""/>
       <tab type="globals" visible="yes" title="" intro=""/>
     </tab>
-    <tab type="dirs" visible="yes" title="" intro=""/>
     <tab type="examples" visible="yes" title="" intro=""/>
     <tab type="pages" visible="yes" title="" intro=""/>
   </navindex>


More information about the Lemon-commits mailing list