COIN-OR::LEMON - Graph Library

About

Downloads

Documentation

Development

Issue Tracker

Browse Tickets

Custom Query

Roadmap

Browse Source

Local Info

Mailing Lists

Search

Changes in / [683:f1909b4c38d6:673:150004315af4] in lemon-1.1


Ignore:
Files:
1 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    r682 r672  
    11CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
    22
    3 SET(PROJECT_NAME "LEMON")
     3IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
     4  INCLUDE(${CMAKE_SOURCE_DIR}/cmake/version.cmake)
     5ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
     6  SET(PROJECT_NAME "LEMON")
     7  SET(PROJECT_VERSION "hg-tip" CACHE STRING "LEMON version string.")
     8ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
     9
    410PROJECT(${PROJECT_NAME})
    5 
    6 IF(EXISTS ${PROJECT_SOURCE_DIR}/cmake/version.cmake)
    7   INCLUDE(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
    8 ELSEIF(DEFINED ENV{LEMON_VERSION})
    9   SET(LEMON_VERSION $ENV{LEMON_VERSION} CACHE STRING "LEMON version string.")
    10 ELSE()
    11   EXECUTE_PROCESS(
    12     COMMAND hg id -i
    13     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
    14     OUTPUT_VARIABLE HG_REVISION
    15     ERROR_QUIET
    16     OUTPUT_STRIP_TRAILING_WHITESPACE
    17   )
    18   IF(HG_REVISION STREQUAL "")
    19     SET(HG_REVISION "hg-tip")
    20   ENDIF()
    21   SET(LEMON_VERSION ${HG_REVISION} CACHE STRING "LEMON version string.")
    22 ENDIF()
    23 
    24 SET(PROJECT_VERSION ${LEMON_VERSION})
    2511
    2612SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
    2713
    28 FIND_PACKAGE(Doxygen)
    29 FIND_PACKAGE(Ghostscript)
     14INCLUDE(FindDoxygen)
     15INCLUDE(FindGhostscript)
    3016FIND_PACKAGE(GLPK 4.33)
    3117FIND_PACKAGE(CPLEX)
    … …  
    3319
    3420INCLUDE(CheckTypeSize)
    35 CHECK_TYPE_SIZE("long long" LONG_LONG)
    36 SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
     21CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)
    3722
    3823ENABLE_TESTING()
    … …  
    4429  ADD_SUBDIRECTORY(doc)
    4530  ADD_SUBDIRECTORY(test)
    46 ENDIF()
     31ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
    4732
    48 CONFIGURE_FILE(
    49   ${PROJECT_SOURCE_DIR}/cmake/LEMONConfig.cmake.in
    50   ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
    51   @ONLY
    52 )
    53 IF(UNIX)
    54   INSTALL(
    55     FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
    56     DESTINATION share/lemon/cmake
    57   )
    58 ELSEIF(WIN32)
    59   INSTALL(
    60     FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
    61     DESTINATION cmake
    62   )
    63 ENDIF()
     33IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
     34  IF(WIN32)
     35    SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
     36    SET(CPACK_PACKAGE_VENDOR "EGRES")
     37    SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
     38      "LEMON - Library for Efficient Modeling and Optimization in Networks")
     39    SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
    6440
    65 IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} AND WIN32)
    66   SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
    67   SET(CPACK_PACKAGE_VENDOR "EGRES")
    68   SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
    69     "LEMON - Library for Efficient Modeling and Optimization in Networks")
    70   SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
     41    SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
    7142
    72   SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
     43    SET(CPACK_PACKAGE_INSTALL_DIRECTORY
     44      "${PROJECT_NAME} ${PROJECT_VERSION}")
     45    SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
     46      "${PROJECT_NAME} ${PROJECT_VERSION}")
    7347
    74   SET(CPACK_PACKAGE_INSTALL_DIRECTORY
    75     "${PROJECT_NAME} ${PROJECT_VERSION}")
    76   SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
    77     "${PROJECT_NAME} ${PROJECT_VERSION}")
     48    SET(CPACK_COMPONENTS_ALL headers library html_documentation bin)
    7849
    79   SET(CPACK_COMPONENTS_ALL headers library html_documentation bin)
     50    SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
     51    SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
     52    SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities")
     53    SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
    8054
    81   SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
    82   SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
    83   SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities")
    84   SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
     55    SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
     56      "C++ header files")
     57    SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
     58      "DLL and import library")
     59    SET(CPACK_COMPONENT_BIN_DESCRIPTION
     60      "Command line utilities")
     61    SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
     62      "Doxygen generated documentation")
    8563
    86   SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
    87     "C++ header files")
    88   SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
    89     "DLL and import library")
    90   SET(CPACK_COMPONENT_BIN_DESCRIPTION
    91     "Command line utilities")
    92   SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
    93     "Doxygen generated documentation")
     64    SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
    9465
    95   SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
     66    SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
     67    SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
     68    SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
    9669
    97   SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
    98   SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
    99   SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
     70    SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
     71      "Components needed to develop software using LEMON")
     72    SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
     73      "Documentation of LEMON")
    10074
    101   SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
    102     "Components needed to develop software using LEMON")
    103   SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
    104     "Documentation of LEMON")
     75    SET(CPACK_ALL_INSTALL_TYPES Full Developer)
    10576
    106   SET(CPACK_ALL_INSTALL_TYPES Full Developer)
     77    SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
     78    SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
     79    SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
    10780
    108   SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
    109   SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
    110   SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
     81    SET(CPACK_GENERATOR "NSIS")
     82    SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis/lemon.ico")
     83    SET(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/cmake/nsis/uninstall.ico")
     84    #SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
     85    SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
     86    SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
     87    SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")
     88    SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
     89    SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")
     90    SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
     91      CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
     92      ")
     93    SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
     94      !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
     95      Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\"
     96      ")
    11197
    112   SET(CPACK_GENERATOR "NSIS")
    113   SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis/lemon.ico")
    114   SET(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/cmake/nsis/uninstall.ico")
    115   #SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
    116   SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
    117   SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
    118   SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")
    119   SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
    120   SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")
    121   SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
    122     CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
    123     ")
    124   SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
    125     !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
    126     Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\"
    127     ")
    128 
    129   INCLUDE(CPack)
    130 ENDIF()
     98    INCLUDE(CPack)
     99  ENDIF(WIN32)
     100ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})

  • cmake/version.cmake.in

    r680 r480  
    1 SET(LEMON_VERSION "@PACKAGE_VERSION@" CACHE STRING "LEMON version string.")
     1SET(PROJECT_NAME "@PACKAGE_NAME@")
     2SET(PROJECT_VERSION "@PACKAGE_VERSION@" CACHE STRING "LEMON version string.")

  • configure.ac

    r682 r622  
    33dnl Version information.
    44m4_define([lemon_version_number],
    5           [m4_normalize(esyscmd([echo ${LEMON_VERSION}]))])
     5        [m4_normalize(esyscmd([echo ${LEMON_VERSION}]))])
    66dnl m4_define([lemon_version_number], [])
    77m4_define([lemon_hg_path], [m4_normalize(esyscmd([./scripts/chg-len.py]))])
    8 m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i 2> /dev/null]))])
     8m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i]))])
    99m4_define([lemon_version], [ifelse(lemon_version_number(),
    10                            [],
    11                            [ifelse(lemon_hg_revision(),
    12                            [],
    13                            [hg-tip],
    14                            [lemon_hg_path().lemon_hg_revision()])],
    15                            [lemon_version_number()])])
     10                           [],
     11                           [lemon_hg_path().lemon_hg_revision()],
     12                           [lemon_version_number()])])
    1613
    1714AC_PREREQ([2.59])
    … …  
    2219AC_CONFIG_SRCDIR([lemon/list_graph.h])
    2320AC_CONFIG_HEADERS([config.h lemon/config.h])
    24 
    25 AC_DEFINE([LEMON_VERSION], [lemon_version()], [The version string])
    2621
    2722dnl Do compilation tests using the C++ compiler.

  • demo/CMakeLists.txt

    r681 r622  
    44)
    55
    6 LINK_DIRECTORIES(
    7   ${PROJECT_BINARY_DIR}/lemon
    8 )
     6LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
    97
    108SET(DEMOS
    119  arg_parser_demo
    1210  graph_to_eps_demo
    13   lgf_demo
    14 )
     11  lgf_demo)
    1512
    1613FOREACH(DEMO_NAME ${DEMOS})
    1714  ADD_EXECUTABLE(${DEMO_NAME} ${DEMO_NAME}.cc)
    1815  TARGET_LINK_LIBRARIES(${DEMO_NAME} lemon)
    19 ENDFOREACH()
     16ENDFOREACH(DEMO_NAME)

  • doc/CMakeLists.txt

    r681 r578  
    77  ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in
    88  ${PROJECT_BINARY_DIR}/doc/Doxyfile
    9   @ONLY
    10 )
     9  @ONLY)
    1110
    1211IF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)
    1312  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/)
    14   SET(GHOSTSCRIPT_OPTIONS -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha)
    15   ADD_CUSTOM_TARGET(html
    16     COMMAND ${CMAKE_COMMAND} -E remove_directory gen-images
    17     COMMAND ${CMAKE_COMMAND} -E make_directory gen-images
    18     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/bipartite_matching.png ${CMAKE_CURRENT_SOURCE_DIR}/images/bipartite_matching.eps
    19     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/bipartite_partitions.png ${CMAKE_CURRENT_SOURCE_DIR}/images/bipartite_partitions.eps
    20     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/connected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/connected_components.eps
    21     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/edge_biconnected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/edge_biconnected_components.eps
    22     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/grid_graph.png ${CMAKE_CURRENT_SOURCE_DIR}/images/grid_graph.eps
    23     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/node_biconnected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/node_biconnected_components.eps
    24     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_0.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_0.eps
    25     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_1.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_1.eps
    26     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_2.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_2.eps
    27     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_3.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_3.eps
    28     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_4.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_4.eps
    29     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/strongly_connected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/strongly_connected_components.eps
    30     COMMAND ${CMAKE_COMMAND} -E remove_directory html
    31     COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
    32     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    33   )
    34 
    35   SET_TARGET_PROPERTIES(html PROPERTIES PROJECT_LABEL BUILD_DOC)
    36 
    3713  IF(UNIX)
    38     INSTALL(
    39       DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
    40       DESTINATION share/doc/lemon/html
    41       COMPONENT html_documentation
    42     )
     14    ADD_CUSTOM_TARGET(html
     15      COMMAND rm -rf gen-images
     16      COMMAND mkdir gen-images
     17      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/bipartite_matching.png ${CMAKE_CURRENT_SOURCE_DIR}/images/bipartite_matching.eps
     18      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/bipartite_partitions.png ${CMAKE_CURRENT_SOURCE_DIR}/images/bipartite_partitions.eps
     19      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/connected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/connected_components.eps
     20      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/edge_biconnected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/edge_biconnected_components.eps
     21      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/grid_graph.png ${CMAKE_CURRENT_SOURCE_DIR}/images/grid_graph.eps
     22      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/node_biconnected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/node_biconnected_components.eps
     23      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_0.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_0.eps
     24      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_1.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_1.eps
     25      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_2.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_2.eps
     26      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_3.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_3.eps
     27      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_4.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_4.eps
     28      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/strongly_connected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/strongly_connected_components.eps
     29      COMMAND rm -rf html
     30      COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
     31      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
    4332  ELSEIF(WIN32)
    44     INSTALL(
    45       DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
    46       DESTINATION doc
    47       COMPONENT html_documentation
    48     )
    49   ENDIF()
    50 
    51 ENDIF()
     33    ADD_CUSTOM_TARGET(html
     34      COMMAND if exist gen-images rmdir /s /q gen-images
     35      COMMAND mkdir gen-images
     36      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/bipartite_matching.png ${CMAKE_CURRENT_SOURCE_DIR}/images/bipartite_matching.eps
     37      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/bipartite_partitions.png ${CMAKE_CURRENT_SOURCE_DIR}/images/bipartite_partitions.eps
     38      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/connected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/connected_components.eps
     39      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/edge_biconnected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/edge_biconnected_components.eps
     40      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/grid_graph.png ${CMAKE_CURRENT_SOURCE_DIR}/images/grid_graph.eps
     41      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/node_biconnected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/node_biconnected_components.eps
     42      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_0.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_0.eps
     43      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_1.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_1.eps
     44      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_2.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_2.eps
     45      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_3.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_3.eps
     46      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_4.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_4.eps
     47      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/strongly_connected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/strongly_connected_components.eps
     48      COMMAND if exist html rmdir /s /q html
     49      COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
     50      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
     51  ENDIF(UNIX)
     52  INSTALL(
     53    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
     54    DESTINATION share/doc
     55    COMPONENT html_documentation)
     56ENDIF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)

  • doc/Makefile.am

    r675 r661  
    9292install-html-local: doc/html
    9393        @$(NORMAL_INSTALL)
    94         $(mkinstalldirs) $(DESTDIR)$(htmldir)/html
     94        $(mkinstalldirs) $(DESTDIR)$(htmldir)/docs
    9595        for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
    9696          f="`echo $$p | sed -e 's|^.*/||'`"; \
    97           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f"; \
    98           $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f; \
     97          echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f"; \
     98          $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f; \
    9999        done
    100100
    … …  
    103103        for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
    104104          f="`echo $$p | sed -e 's|^.*/||'`"; \
    105           echo " rm -f $(DESTDIR)$(htmldir)/html/$$f"; \
    106           rm -f $(DESTDIR)$(htmldir)/html/$$f; \
     105          echo " rm -f $(DESTDIR)$(htmldir)/docs/$$f"; \
     106          rm -f $(DESTDIR)$(htmldir)/docs/$$f; \
    107107        done
    108108

  • lemon/CMakeLists.txt

    r681 r622  
    2626    INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
    2727    INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
    28   ENDIF()
    29 ENDIF()
     28  ENDIF(WIN32)
     29ENDIF(LEMON_HAVE_GLPK)
    3030
    3131IF(LEMON_HAVE_CPLEX)
    3232  SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
    3333  INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})
    34 ENDIF()
     34ENDIF(LEMON_HAVE_CPLEX)
    3535
    3636IF(LEMON_HAVE_CLP)
    3737  SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc)
    3838  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
    39 ENDIF()
     39ENDIF(LEMON_HAVE_CLP)
    4040
    4141IF(LEMON_HAVE_CBC)
    4242  SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc)
    4343  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
    44 ENDIF()
     44ENDIF(LEMON_HAVE_CBC)
    4545
    4646ADD_LIBRARY(lemon ${LEMON_SOURCES})
    47 IF(UNIX)
    48   SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon)
    49 ENDIF()
    5047
    5148INSTALL(
    5249  TARGETS lemon
    5350  ARCHIVE DESTINATION lib
    54   COMPONENT library
    55 )
     51  COMPONENT library)
    5652
    5753INSTALL(
    … …  
    5955  DESTINATION include/lemon
    6056  COMPONENT headers
    61   FILES_MATCHING PATTERN "*.h"
    62 )
     57  FILES_MATCHING PATTERN "*.h")
    6358
    6459INSTALL(
    6560  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
    6661  DESTINATION include/lemon
    67   COMPONENT headers
    68 )
     62  COMPONENT headers)

  • lemon/config.h.cmake

    r680 r622  
    1 #define LEMON_VERSION "@PROJECT_VERSION@"
    21#cmakedefine LEMON_HAVE_LONG_LONG 1
    32#cmakedefine LEMON_HAVE_LP 1

  • lemon/config.h.in

    r680 r622  
    1 /* The version string */
    2 #undef LEMON_VERSION
    3 
    41/* Define to 1 if you have long long */
    52#undef LEMON_HAVE_LONG_LONG

  • test/CMakeLists.txt

    r681 r647  
    44)
    55
    6 LINK_DIRECTORIES(
    7   ${PROJECT_BINARY_DIR}/lemon
    8 )
     6LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
    97
    108SET(TESTS
    … …  
    3836  suurballe_test
    3937  time_measure_test
    40   unionfind_test
    41 )
     38  unionfind_test)
    4239
    4340IF(LEMON_HAVE_LP)
    4441  ADD_EXECUTABLE(lp_test lp_test.cc)
    4542  SET(LP_TEST_LIBS lemon)
    46 
    4743  IF(LEMON_HAVE_GLPK)
    4844    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
    49   ENDIF()
     45  ENDIF(LEMON_HAVE_GLPK)
    5046  IF(LEMON_HAVE_CPLEX)
    5147    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
    52   ENDIF()
     48  ENDIF(LEMON_HAVE_CPLEX)
    5349  IF(LEMON_HAVE_CLP)
    5450    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
    55   ENDIF()
    56 
     51  ENDIF(LEMON_HAVE_CLP)
    5752  TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
    5853  ADD_TEST(lp_test lp_test)
    … …  
    6257    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    6358    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    64       COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
    65       COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
    66       COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
     59      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
     60      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
     61      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
    6762    )
    68   ENDIF()
    69 
     63  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
    7064  IF(WIN32 AND LEMON_HAVE_CPLEX)
    7165    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
    7266    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    7367    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    74       COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
     68      COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
    7569    )
    76   ENDIF()
    77 ENDIF()
     70  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
     71ENDIF(LEMON_HAVE_LP)
    7872
    7973IF(LEMON_HAVE_MIP)
    8074  ADD_EXECUTABLE(mip_test mip_test.cc)
    8175  SET(MIP_TEST_LIBS lemon)
    82 
    8376  IF(LEMON_HAVE_GLPK)
    8477    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
    85   ENDIF()
     78  ENDIF(LEMON_HAVE_GLPK)
    8679  IF(LEMON_HAVE_CPLEX)
    8780    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
    88   ENDIF()
     81  ENDIF(LEMON_HAVE_CPLEX)
    8982  IF(LEMON_HAVE_CBC)
    9083    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
    91   ENDIF()
    92 
     84  ENDIF(LEMON_HAVE_CBC)
    9385  TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
    9486  ADD_TEST(mip_test mip_test)
    … …  
    9890    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    9991    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    100       COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
    101       COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
    102       COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
     92      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
     93      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
     94      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
    10395    )
    104   ENDIF()
    105 
     96  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
    10697  IF(WIN32 AND LEMON_HAVE_CPLEX)
    10798    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
    10899    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    109100    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    110       COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
     101      COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
    111102    )
    112   ENDIF()
    113 ENDIF()
     103  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
     104ENDIF(LEMON_HAVE_MIP)
    114105
    115106FOREACH(TEST_NAME ${TESTS})
    … …  
    117108  TARGET_LINK_LIBRARIES(${TEST_NAME} lemon)
    118109  ADD_TEST(${TEST_NAME} ${TEST_NAME})
    119 ENDFOREACH()
     110ENDFOREACH(TEST_NAME)

  • tools/CMakeLists.txt

    r681 r538  
    44)
    55
    6 LINK_DIRECTORIES(
    7   ${PROJECT_BINARY_DIR}/lemon
    8 )
     6LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
    97
    108ADD_EXECUTABLE(lgf-gen lgf-gen.cc)
    … …  
    2725    PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/lemon-0.x-to-1.x.sh
    2826    DESTINATION bin
    29     COMPONENT bin
    30   )
    31 ENDIF()
     27    COMPONENT bin)
     28ENDIF(NOT WIN32)

  • tools/Makefile.am

    r676 r510  
    1 EXTRA_DIST += \
    2         tools/CMakeLists.txt
    3 
    41if WANT_TOOLS
    52
Note: See TracChangeset for help on using the changeset viewer.