Changes in / [673:150004315af4:683:f1909b4c38d6] in lemon-1.1
- Files:
-
- 1 added
- 12 edited
-
CMakeLists.txt (modified) (3 diffs)
-
cmake/LEMONConfig.cmake.in (added)
-
cmake/version.cmake.in (modified) (1 diff)
-
configure.ac (modified) (2 diffs)
-
demo/CMakeLists.txt (modified) (1 diff)
-
doc/CMakeLists.txt (modified) (1 diff)
-
doc/Makefile.am (modified) (2 diffs)
-
lemon/CMakeLists.txt (modified) (2 diffs)
-
lemon/config.h.cmake (modified) (1 diff)
-
lemon/config.h.in (modified) (1 diff)
-
test/CMakeLists.txt (modified) (5 diffs)
-
tools/CMakeLists.txt (modified) (2 diffs)
-
tools/Makefile.am (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
CMakeLists.txt
r672 r682 1 1 CMAKE_MINIMUM_REQUIRED(VERSION 2.6) 2 2 3 IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake) 4 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/version.cmake) 5 ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake) 6 SET(PROJECT_NAME "LEMON") 7 SET(PROJECT_VERSION "hg-tip" CACHE STRING "LEMON version string.") 8 ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake) 3 SET(PROJECT_NAME "LEMON") 4 PROJECT(${PROJECT_NAME}) 9 5 10 PROJECT(${PROJECT_NAME}) 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}) 11 25 12 26 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) 13 27 14 INCLUDE(FindDoxygen)15 INCLUDE(FindGhostscript)28 FIND_PACKAGE(Doxygen) 29 FIND_PACKAGE(Ghostscript) 16 30 FIND_PACKAGE(GLPK 4.33) 17 31 FIND_PACKAGE(CPLEX) … … 19 33 20 34 INCLUDE(CheckTypeSize) 21 CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG) 35 CHECK_TYPE_SIZE("long long" LONG_LONG) 36 SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG}) 22 37 23 38 ENABLE_TESTING() … … 29 44 ADD_SUBDIRECTORY(doc) 30 45 ADD_SUBDIRECTORY(test) 31 ENDIF( ${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})46 ENDIF() 32 47 33 IF(${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") 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() 40 64 41 SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) 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") 42 71 43 SET(CPACK_PACKAGE_INSTALL_DIRECTORY 44 "${PROJECT_NAME} ${PROJECT_VERSION}") 45 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY 46 "${PROJECT_NAME} ${PROJECT_VERSION}") 72 SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) 47 73 48 SET(CPACK_COMPONENTS_ALL headers library html_documentation bin) 74 SET(CPACK_PACKAGE_INSTALL_DIRECTORY 75 "${PROJECT_NAME} ${PROJECT_VERSION}") 76 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY 77 "${PROJECT_NAME} ${PROJECT_VERSION}") 49 78 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") 79 SET(CPACK_COMPONENTS_ALL headers library html_documentation bin) 54 80 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") 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") 63 85 64 SET(CPACK_COMPONENT_HEADERS_DEPENDS library) 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") 65 94 66 SET(CPACK_COMPONENT_HEADERS_GROUP "Development") 67 SET(CPACK_COMPONENT_LIBRARY_GROUP "Development") 68 SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation") 95 SET(CPACK_COMPONENT_HEADERS_DEPENDS library) 69 96 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") 97 SET(CPACK_COMPONENT_HEADERS_GROUP "Development") 98 SET(CPACK_COMPONENT_LIBRARY_GROUP "Development") 99 SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation") 74 100 75 SET(CPACK_ALL_INSTALL_TYPES Full Developer) 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") 76 105 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) 106 SET(CPACK_ALL_INSTALL_TYPES Full Developer) 80 107 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 ") 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) 97 111 98 INCLUDE(CPack) 99 ENDIF(WIN32) 100 ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) 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() -
cmake/version.cmake.in
r480 r680 1 SET(PROJECT_NAME "@PACKAGE_NAME@") 2 SET(PROJECT_VERSION "@PACKAGE_VERSION@" CACHE STRING "LEMON version string.") 1 SET(LEMON_VERSION "@PACKAGE_VERSION@" CACHE STRING "LEMON version string.") -
configure.ac
r622 r682 3 3 dnl Version information. 4 4 m4_define([lemon_version_number], 5 5 [m4_normalize(esyscmd([echo ${LEMON_VERSION}]))]) 6 6 dnl m4_define([lemon_version_number], []) 7 7 m4_define([lemon_hg_path], [m4_normalize(esyscmd([./scripts/chg-len.py]))]) 8 m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i ]))])8 m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i 2> /dev/null]))]) 9 9 m4_define([lemon_version], [ifelse(lemon_version_number(), 10 [], 11 [lemon_hg_path().lemon_hg_revision()], 12 [lemon_version_number()])]) 10 [], 11 [ifelse(lemon_hg_revision(), 12 [], 13 [hg-tip], 14 [lemon_hg_path().lemon_hg_revision()])], 15 [lemon_version_number()])]) 13 16 14 17 AC_PREREQ([2.59]) … … 19 22 AC_CONFIG_SRCDIR([lemon/list_graph.h]) 20 23 AC_CONFIG_HEADERS([config.h lemon/config.h]) 24 25 AC_DEFINE([LEMON_VERSION], [lemon_version()], [The version string]) 21 26 22 27 dnl Do compilation tests using the C++ compiler. -
demo/CMakeLists.txt
r622 r681 4 4 ) 5 5 6 LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon) 6 LINK_DIRECTORIES( 7 ${PROJECT_BINARY_DIR}/lemon 8 ) 7 9 8 10 SET(DEMOS 9 11 arg_parser_demo 10 12 graph_to_eps_demo 11 lgf_demo) 13 lgf_demo 14 ) 12 15 13 16 FOREACH(DEMO_NAME ${DEMOS}) 14 17 ADD_EXECUTABLE(${DEMO_NAME} ${DEMO_NAME}.cc) 15 18 TARGET_LINK_LIBRARIES(${DEMO_NAME} lemon) 16 ENDFOREACH( DEMO_NAME)19 ENDFOREACH() -
doc/CMakeLists.txt
r578 r681 7 7 ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in 8 8 ${PROJECT_BINARY_DIR}/doc/Doxyfile 9 @ONLY) 9 @ONLY 10 ) 10 11 11 12 IF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE) 12 13 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 13 37 IF(UNIX) 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}) 38 INSTALL( 39 DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ 40 DESTINATION share/doc/lemon/html 41 COMPONENT html_documentation 42 ) 32 43 ELSEIF(WIN32) 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) 56 ENDIF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE) 44 INSTALL( 45 DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ 46 DESTINATION doc 47 COMPONENT html_documentation 48 ) 49 ENDIF() 50 51 ENDIF() -
doc/Makefile.am
r661 r675 92 92 install-html-local: doc/html 93 93 @$(NORMAL_INSTALL) 94 $(mkinstalldirs) $(DESTDIR)$(htmldir)/ docs94 $(mkinstalldirs) $(DESTDIR)$(htmldir)/html 95 95 for p in doc/html/*.{html,css,png,map,gif,tag} ; do \ 96 96 f="`echo $$p | sed -e 's|^.*/||'`"; \ 97 echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/ docs/$$f"; \98 $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/ docs/$$f; \97 echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f"; \ 98 $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f; \ 99 99 done 100 100 … … 103 103 for p in doc/html/*.{html,css,png,map,gif,tag} ; do \ 104 104 f="`echo $$p | sed -e 's|^.*/||'`"; \ 105 echo " rm -f $(DESTDIR)$(htmldir)/ docs/$$f"; \106 rm -f $(DESTDIR)$(htmldir)/ docs/$$f; \105 echo " rm -f $(DESTDIR)$(htmldir)/html/$$f"; \ 106 rm -f $(DESTDIR)$(htmldir)/html/$$f; \ 107 107 done 108 108 -
lemon/CMakeLists.txt
r622 r681 26 26 INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin) 27 27 INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin) 28 ENDIF( WIN32)29 ENDIF( LEMON_HAVE_GLPK)28 ENDIF() 29 ENDIF() 30 30 31 31 IF(LEMON_HAVE_CPLEX) 32 32 SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc) 33 33 INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS}) 34 ENDIF( LEMON_HAVE_CPLEX)34 ENDIF() 35 35 36 36 IF(LEMON_HAVE_CLP) 37 37 SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc) 38 38 INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS}) 39 ENDIF( LEMON_HAVE_CLP)39 ENDIF() 40 40 41 41 IF(LEMON_HAVE_CBC) 42 42 SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc) 43 43 INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS}) 44 ENDIF( LEMON_HAVE_CBC)44 ENDIF() 45 45 46 46 ADD_LIBRARY(lemon ${LEMON_SOURCES}) 47 IF(UNIX) 48 SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon) 49 ENDIF() 47 50 48 51 INSTALL( 49 52 TARGETS lemon 50 53 ARCHIVE DESTINATION lib 51 COMPONENT library) 54 COMPONENT library 55 ) 52 56 53 57 INSTALL( … … 55 59 DESTINATION include/lemon 56 60 COMPONENT headers 57 FILES_MATCHING PATTERN "*.h") 61 FILES_MATCHING PATTERN "*.h" 62 ) 58 63 59 64 INSTALL( 60 65 FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h 61 66 DESTINATION include/lemon 62 COMPONENT headers) 67 COMPONENT headers 68 ) -
lemon/config.h.cmake
r622 r680 1 #define LEMON_VERSION "@PROJECT_VERSION@" 1 2 #cmakedefine LEMON_HAVE_LONG_LONG 1 2 3 #cmakedefine LEMON_HAVE_LP 1 -
lemon/config.h.in
r622 r680 1 /* The version string */ 2 #undef LEMON_VERSION 3 1 4 /* Define to 1 if you have long long */ 2 5 #undef LEMON_HAVE_LONG_LONG -
test/CMakeLists.txt
r647 r681 4 4 ) 5 5 6 LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon) 6 LINK_DIRECTORIES( 7 ${PROJECT_BINARY_DIR}/lemon 8 ) 7 9 8 10 SET(TESTS … … 36 38 suurballe_test 37 39 time_measure_test 38 unionfind_test) 40 unionfind_test 41 ) 39 42 40 43 IF(LEMON_HAVE_LP) 41 44 ADD_EXECUTABLE(lp_test lp_test.cc) 42 45 SET(LP_TEST_LIBS lemon) 46 43 47 IF(LEMON_HAVE_GLPK) 44 48 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES}) 45 ENDIF( LEMON_HAVE_GLPK)49 ENDIF() 46 50 IF(LEMON_HAVE_CPLEX) 47 51 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES}) 48 ENDIF( LEMON_HAVE_CPLEX)52 ENDIF() 49 53 IF(LEMON_HAVE_CLP) 50 54 SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES}) 51 ENDIF(LEMON_HAVE_CLP) 55 ENDIF() 56 52 57 TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS}) 53 58 ADD_TEST(lp_test lp_test) … … 57 62 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 58 63 ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD 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}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} 62 67 ) 63 ENDIF(WIN32 AND LEMON_HAVE_GLPK) 68 ENDIF() 69 64 70 IF(WIN32 AND LEMON_HAVE_CPLEX) 65 71 GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) 66 72 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 67 73 ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD 68 COMMAND cmake-E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}74 COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} 69 75 ) 70 ENDIF( WIN32 AND LEMON_HAVE_CPLEX)71 ENDIF( LEMON_HAVE_LP)76 ENDIF() 77 ENDIF() 72 78 73 79 IF(LEMON_HAVE_MIP) 74 80 ADD_EXECUTABLE(mip_test mip_test.cc) 75 81 SET(MIP_TEST_LIBS lemon) 82 76 83 IF(LEMON_HAVE_GLPK) 77 84 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES}) 78 ENDIF( LEMON_HAVE_GLPK)85 ENDIF() 79 86 IF(LEMON_HAVE_CPLEX) 80 87 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES}) 81 ENDIF( LEMON_HAVE_CPLEX)88 ENDIF() 82 89 IF(LEMON_HAVE_CBC) 83 90 SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES}) 84 ENDIF(LEMON_HAVE_CBC) 91 ENDIF() 92 85 93 TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS}) 86 94 ADD_TEST(mip_test mip_test) … … 90 98 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 91 99 ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD 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}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} 95 103 ) 96 ENDIF(WIN32 AND LEMON_HAVE_GLPK) 104 ENDIF() 105 97 106 IF(WIN32 AND LEMON_HAVE_CPLEX) 98 107 GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION) 99 108 GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) 100 109 ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD 101 COMMAND cmake-E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}110 COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH} 102 111 ) 103 ENDIF( WIN32 AND LEMON_HAVE_CPLEX)104 ENDIF( LEMON_HAVE_MIP)112 ENDIF() 113 ENDIF() 105 114 106 115 FOREACH(TEST_NAME ${TESTS}) … … 108 117 TARGET_LINK_LIBRARIES(${TEST_NAME} lemon) 109 118 ADD_TEST(${TEST_NAME} ${TEST_NAME}) 110 ENDFOREACH( TEST_NAME)119 ENDFOREACH() -
tools/CMakeLists.txt
r538 r681 4 4 ) 5 5 6 LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon) 6 LINK_DIRECTORIES( 7 ${PROJECT_BINARY_DIR}/lemon 8 ) 7 9 8 10 ADD_EXECUTABLE(lgf-gen lgf-gen.cc) … … 25 27 PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/lemon-0.x-to-1.x.sh 26 28 DESTINATION bin 27 COMPONENT bin) 28 ENDIF(NOT WIN32) 29 COMPONENT bin 30 ) 31 ENDIF() -
tools/Makefile.am
r510 r676 1 EXTRA_DIST += \ 2 tools/CMakeLists.txt 3 1 4 if WANT_TOOLS 2 5
Note: See TracChangeset
for help on using the changeset viewer.
