# HG changeset patch # User Alpar Juttner # Date 1362158407 -3600 # Node ID 0b0327c9b3eff9c42a2d7792e0a68c107872929f # Parent a2d142bb5d3c8b382e0530d3253fe19dbe6883dd# Parent 60c0c3ed8d110ae98e6e24afa36a76abba50a3ee Merge #455 diff -r a2d142bb5d3c -r 0b0327c9b3ef INSTALL --- a/INSTALL Fri Mar 01 17:59:08 2013 +0100 +++ b/INSTALL Fri Mar 01 18:20:07 2013 +0100 @@ -106,6 +106,34 @@ Build shared library instead of static one. Think twice if you really want to use this option. +-DLEMON_DOC_SOURCE_BROWSER=YES + + Include the browsable cross referenced LEMON source code into the + doc. It makes the doc quite bloated, but may be useful for + developing LEMON itself. + +-DLEMON_DOC_USE_MATHJAX=YES + + Use MathJax (http://mathjax.org) for rendering the math formulae in + the doc. It of much higher quality compared to the default LaTeX + generated static images and it allows copy&paste of the formulae to + LaTeX, Open Office, MS Word etc. documents. + + On the other hand, it needs either Internet access or a locally + installed version of MathJax to properly render the doc. + +-DLEMON_DOC_MATHJAX_RELPATH=DIRECTORY + + The location of the MathJax library. It defaults to + http://www.mathjax.org/mathjax, which necessitates Internet access + for proper rendering. The easiest way to make it usable offline is + to set this parameter to 'mathjax' and copy all files of the MathJax + library into the 'doc/html/mathjax' subdirectory of the build + location. + + See http://docs.mathjax.org/en/latest/installation.html for more details. + + -DGLPK_ROOT_DIR=DIRECTORY -DCOIN_ROOT_DIR=DIRECTORY -DCPLEX_ROOT_DIR=DIRECTORY diff -r a2d142bb5d3c -r 0b0327c9b3ef doc/CMakeLists.txt --- a/doc/CMakeLists.txt Fri Mar 01 17:59:08 2013 +0100 +++ b/doc/CMakeLists.txt Fri Mar 01 18:20:07 2013 +0100 @@ -4,6 +4,8 @@ SET(abs_top_builddir ${PROJECT_BINARY_DIR}) SET(LEMON_DOC_SOURCE_BROWSER "NO" CACHE STRING "Include source into the doc (YES/NO).") +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.") CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in @@ -73,12 +75,7 @@ IF(WGET_FOUND) ADD_CUSTOM_TARGET(update-external-tags - COMMAND ${CMAKE_COMMAND} -E make_directory dl - # COMMAND ${CMAKE_COMMAND} -E copy libstdc++.tag dl - COMMAND ${WGET_EXECUTABLE} wget -P dl -N libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag - COMMAND ${CMAKE_COMMAND} -E rename dl/libstdc++.tag libstdc++.tag - COMMAND ${CMAKE_COMMAND} -E remove dl/libstdc++.tag - COMMAND ${CMAKE_COMMAND} -E remove_directory dl + COMMAND ${WGET_EXECUTABLE} -N http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) ENDIF() diff -r a2d142bb5d3c -r 0b0327c9b3ef doc/Doxyfile.in --- a/doc/Doxyfile.in Fri Mar 01 17:59:08 2013 +0100 +++ b/doc/Doxyfile.in Fri Mar 01 18:20:07 2013 +0100 @@ -182,8 +182,8 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES -USE_MATHJAX = NO -MATHJAX_RELPATH = http://www.mathjax.org/mathjax +USE_MATHJAX = @LEMON_DOC_USE_MATHJAX@ +MATHJAX_RELPATH = @LEMON_DOC_MATHJAX_RELPATH@ SEARCHENGINE = YES SERVER_BASED_SEARCH = NO #---------------------------------------------------------------------------