diff -r 2b6a20528f35 -r 29cbdb01d5f0 CMakeLists.txt --- a/CMakeLists.txt Thu Jan 22 15:15:51 2009 +0000 +++ b/CMakeLists.txt Fri Jan 23 16:39:28 2009 +0000 @@ -1,7 +1,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -SET(PROJECT_NAME "LEMON") -SET(PROJECT_VERSION "hg-tip" CACHE STRING "The version string.") +IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake) + INCLUDE(${CMAKE_SOURCE_DIR}/cmake/version.cmake) +ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake) + SET(PROJECT_NAME "LEMON") + SET(PROJECT_VERSION "hg-tip" CACHE STRING "LEMON version string.") +ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake) PROJECT(${PROJECT_NAME}) @@ -27,14 +31,8 @@ ADD_SUBDIRECTORY(test) IF(WIN32) - INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico - DESTINATION bin) -ENDIF(WIN32) - -IF(WIN32) SET(CPACK_PACKAGE_NAME ${PROJECT_NAME}) - SET(CPACK_PACKAGE_VENDOR - "EGRES - Egervary Research Group on Combinatorial Optimization") + SET(CPACK_PACKAGE_VENDOR "EGRES") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LEMON - Library of Efficient Models and Optimization in Networks") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") @@ -46,36 +44,35 @@ SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${PROJECT_NAME} ${PROJECT_VERSION}") - # Variables to generate a component-based installer. - #SET(CPACK_COMPONENTS_ALL headers library html_documentation) + SET(CPACK_COMPONENTS_ALL headers library html_documentation) - #SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers") - #SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Static library") - #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation") + SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers") + SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library") + SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation") - #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION - # "C++ header files for use with the LEMON library") - #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION - # "Static library used to build programs with LEMON") - #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION - # "Doxygen generated documentation") + SET(CPACK_COMPONENT_HEADERS_DESCRIPTION + "C++ header files") + SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION + "DLL and import library") + SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION + "Doxygen generated documentation") - #SET(CPACK_COMPONENT_HEADERS_DEPENDS library) + SET(CPACK_COMPONENT_HEADERS_DEPENDS library) - #SET(CPACK_COMPONENT_HEADERS_GROUP "Development") - #SET(CPACK_COMPONENT_LIBRARY_GROUP "Development") - #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation") + SET(CPACK_COMPONENT_HEADERS_GROUP "Development") + SET(CPACK_COMPONENT_LIBRARY_GROUP "Development") + SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation") - #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION - # "Components needed to develop software using LEMON") - #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION - # "Documentation of LEMON") + SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION + "Components needed to develop software using LEMON") + SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION + "Documentation of LEMON") - #SET(CPACK_ALL_INSTALL_TYPES Full Developer) + SET(CPACK_ALL_INSTALL_TYPES Full Developer) - #SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full) - #SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full) - #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full) + SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full) + SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full) + SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full) SET(CPACK_GENERATOR "NSIS") SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico")