COIN-OR::LEMON - Graph Library

Changeset 1041:0b0327c9b3ef in lemon-main


Ignore:
Timestamp:
03/01/13 18:20:07 (12 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1038:a2d142bb5d3c (diff), 1040:60c0c3ed8d11 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge #455

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • doc/CMakeLists.txt

    r1038 r1041  
    55
    66SET(LEMON_DOC_SOURCE_BROWSER "NO" CACHE STRING "Include source into the doc (YES/NO).")
     7SET(LEMON_DOC_USE_MATHJAX "NO" CACHE STRING "Use MathJax to display math formulae (YES/NO).")
     8SET(LEMON_DOC_MATHJAX_RELPATH "http://www.mathjax.org/mathjax" CACHE STRING "MathJax library location.")
    79
    810CONFIGURE_FILE(
     
    7476IF(WGET_FOUND)
    7577ADD_CUSTOM_TARGET(update-external-tags
    76   COMMAND ${CMAKE_COMMAND} -E make_directory dl
    77   # COMMAND ${CMAKE_COMMAND} -E copy libstdc++.tag dl
    78   COMMAND ${WGET_EXECUTABLE} wget -P dl -N libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag
    79   COMMAND ${CMAKE_COMMAND} -E rename dl/libstdc++.tag libstdc++.tag
    80   COMMAND ${CMAKE_COMMAND} -E remove dl/libstdc++.tag
    81   COMMAND ${CMAKE_COMMAND} -E remove_directory dl
     78  COMMAND ${WGET_EXECUTABLE} -N http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag
    8279  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    8380  )
  • doc/CMakeLists.txt

    r1040 r1041  
    4949    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/planar.png ${CMAKE_CURRENT_SOURCE_DIR}/images/planar.eps
    5050    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/strongly_connected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/strongly_connected_components.eps
     51    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/tsp.png ${CMAKE_CURRENT_SOURCE_DIR}/images/tsp.eps
    5152    COMMAND ${CMAKE_COMMAND} -E remove_directory html
    5253    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/bib2dox.py ${CMAKE_CURRENT_SOURCE_DIR}/references.bib >references.dox
Note: See TracChangeset for help on using the changeset viewer.