1.1 --- a/CMakeLists.txt	Thu Jan 22 10:39:56 2009 +0000
     1.2 +++ b/CMakeLists.txt	Thu Jan 22 10:39:13 2009 +0000
     1.3 @@ -18,14 +18,8 @@
     1.4  ADD_SUBDIRECTORY(test)
     1.5  
     1.6  IF(WIN32)
     1.7 -  INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico
     1.8 -    DESTINATION bin)
     1.9 -ENDIF(WIN32)
    1.10 -
    1.11 -IF(WIN32)
    1.12    SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
    1.13 -  SET(CPACK_PACKAGE_VENDOR
    1.14 -    "EGRES - Egervary Research Group on Combinatorial Optimization")
    1.15 +  SET(CPACK_PACKAGE_VENDOR "EGRES")
    1.16    SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
    1.17      "LEMON - Library of Efficient Models and Optimization in Networks")
    1.18    SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
    1.19 @@ -37,36 +31,35 @@
    1.20    SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
    1.21      "${PROJECT_NAME} ${PROJECT_VERSION}")
    1.22  
    1.23 -  # Variables to generate a component-based installer.
    1.24 -  #SET(CPACK_COMPONENTS_ALL headers library html_documentation)
    1.25 +  SET(CPACK_COMPONENTS_ALL headers library html_documentation)
    1.26  
    1.27 -  #SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
    1.28 -  #SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Static library")
    1.29 -  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
    1.30 +  SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
    1.31 +  SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
    1.32 +  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
    1.33  
    1.34 -  #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
    1.35 -  #  "C++ header files for use with the LEMON library")
    1.36 -  #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
    1.37 -  #  "Static library used to build programs with LEMON")
    1.38 -  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
    1.39 -  #  "Doxygen generated documentation")
    1.40 +  SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
    1.41 +    "C++ header files")
    1.42 +  SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
    1.43 +    "DLL and import library")
    1.44 +  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
    1.45 +    "Doxygen generated documentation")
    1.46  
    1.47 -  #SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
    1.48 +  SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
    1.49  
    1.50 -  #SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
    1.51 -  #SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
    1.52 -  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
    1.53 +  SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
    1.54 +  SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
    1.55 +  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
    1.56  
    1.57 -  #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
    1.58 -  #  "Components needed to develop software using LEMON")
    1.59 -  #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
    1.60 -  #  "Documentation of LEMON")
    1.61 +  SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
    1.62 +    "Components needed to develop software using LEMON")
    1.63 +  SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
    1.64 +    "Documentation of LEMON")
    1.65  
    1.66 -  #SET(CPACK_ALL_INSTALL_TYPES Full Developer)
    1.67 +  SET(CPACK_ALL_INSTALL_TYPES Full Developer)
    1.68  
    1.69 -  #SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
    1.70 -  #SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
    1.71 -  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
    1.72 +  SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
    1.73 +  SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
    1.74 +  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
    1.75  
    1.76    SET(CPACK_GENERATOR "NSIS")
    1.77    SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico")