COIN-OR::LEMON - Graph Library

Changeset 905:d149eaf24638 in lemon-1.2 for doc


Ignore:
Timestamp:
03/04/11 10:40:44 (8 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.2
Parents:
902:79fab87ee483 (diff), 904:16d466589b54 (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 CMAKE backports to branch 1.2

Location:
doc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • doc/CMakeLists.txt

    r865 r905  
    33SET(abs_top_srcdir ${PROJECT_SOURCE_DIR})
    44SET(abs_top_builddir ${PROJECT_BINARY_DIR})
     5
     6SET(LEMON_DOC_SOURCE_BROWSER "NO" CACHE STRING "Include source into the doc (YES/NO).")
    57
    68CONFIGURE_FILE(
     
    5355
    5456ENDIF()
     57
     58IF(WGET_FOUND)
     59ADD_CUSTOM_TARGET(update-external-tags
     60  COMMAND ${CMAKE_COMMAND} -E make_directory dl
     61  # COMMAND ${CMAKE_COMMAND} -E copy libstdc++.tag dl
     62  COMMAND ${WGET_EXECUTABLE} wget -P dl -N libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag
     63  COMMAND ${CMAKE_COMMAND} -E rename dl/libstdc++.tag libstdc++.tag
     64  COMMAND ${CMAKE_COMMAND} -E remove dl/libstdc++.tag
     65  COMMAND ${CMAKE_COMMAND} -E remove_directory dl
     66  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     67  )
     68ENDIF()
  • doc/CMakeLists.txt

    r904 r905  
    1212)
    1313
    14 IF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)
     14IF(DOXYGEN_EXECUTABLE AND PYTHONINTERP_FOUND AND GHOSTSCRIPT_EXECUTABLE)
    1515  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/)
    1616  SET(GHOSTSCRIPT_OPTIONS -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha)
     
    2323    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/edge_biconnected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/edge_biconnected_components.eps
    2424    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/grid_graph.png ${CMAKE_CURRENT_SOURCE_DIR}/images/grid_graph.eps
     25    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/matching.png ${CMAKE_CURRENT_SOURCE_DIR}/images/matching.eps
    2526    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/node_biconnected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/node_biconnected_components.eps
    2627    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_0.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_0.eps
     
    2930    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_3.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_3.eps
    3031    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_4.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_4.eps
     32    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/planar.png ${CMAKE_CURRENT_SOURCE_DIR}/images/planar.eps
    3133    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/strongly_connected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/strongly_connected_components.eps
    3234    COMMAND ${CMAKE_COMMAND} -E remove_directory html
     35    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/bib2dox.py ${CMAKE_CURRENT_SOURCE_DIR}/references.bib >references.dox
    3336    COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
    3437    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
  • doc/Doxyfile.in

    r756 r905  
    7171SHOW_NAMESPACES        = YES
    7272FILE_VERSION_FILTER    =
    73 LAYOUT_FILE            = DoxygenLayout.xml
     73LAYOUT_FILE            = "@abs_top_srcdir@/doc/DoxygenLayout.xml"
    7474#---------------------------------------------------------------------------
    7575# configuration options related to warning and progress messages
     
    115115# configuration options related to source browsing
    116116#---------------------------------------------------------------------------
    117 SOURCE_BROWSER         = NO
     117SOURCE_BROWSER         = @LEMON_DOC_SOURCE_BROWSER@
    118118INLINE_SOURCES         = NO
    119119STRIP_CODE_COMMENTS    = YES
     
    226226# Options related to the search engine   
    227227#---------------------------------------------------------------------------
    228 TAGFILES               = "@abs_top_srcdir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/  "
     228TAGFILES               = "@abs_top_builddir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/  "
    229229GENERATE_TAGFILE       = html/lemon.tag
    230230ALLEXTERNALS           = NO
  • doc/Doxyfile.in

    r904 r905  
    9191                         "@abs_top_srcdir@/demo" \
    9292                         "@abs_top_srcdir@/tools" \
    93                          "@abs_top_srcdir@/test/test_tools.h"
     93                         "@abs_top_srcdir@/test/test_tools.h" \
     94                         "@abs_top_builddir@/doc/references.dox"
    9495INPUT_ENCODING         = UTF-8
    9596FILE_PATTERNS          = *.h \
Note: See TracChangeset for help on using the changeset viewer.