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

     2.1 --- a/Makefile.am	Thu Jan 22 14:46:15 2009 +0000
     2.2 +++ b/Makefile.am	Fri Jan 23 16:42:07 2009 +0000
     2.3 @@ -12,7 +12,12 @@
     2.4  	m4/lx_check_glpk.m4 \
     2.5  	m4/lx_check_soplex.m4 \
     2.6  	CMakeLists.txt \
     2.7 -	cmake
     2.8 +	cmake/FindGhostscript.cmake \
     2.9 +	cmake/FindGLPK.cmake \
    2.10 +	cmake/version.cmake.in \
    2.11 +	cmake/version.cmake \
    2.12 +	cmake/nsis/lemon.ico \
    2.13 +	cmake/nsis/uninstall.ico
    2.14  
    2.15  pkgconfigdir = $(libdir)/pkgconfig
    2.16  lemondir = $(pkgincludedir)

     3.1 Binary file cmake/nsis/lemon.ico has changed

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/cmake/version.cmake.in	Fri Jan 23 16:42:07 2009 +0000
     4.3 @@ -0,0 +1,2 @@
     4.4 +SET(PROJECT_NAME "@PACKAGE_NAME@")
     4.5 +SET(PROJECT_VERSION "@PACKAGE_VERSION@" CACHE STRING "LEMON version string.")

     5.1 --- a/configure.ac	Thu Jan 22 14:46:15 2009 +0000
     5.2 +++ b/configure.ac	Fri Jan 23 16:42:07 2009 +0000
     5.3 @@ -100,10 +100,11 @@
     5.4  
     5.5  dnl Add dependencies on files generated by configure.
     5.6  AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
     5.7 -  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in'])
     5.8 +  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
     5.9  
    5.10  AC_CONFIG_FILES([
    5.11  Makefile
    5.12 +cmake/version.cmake
    5.13  doc/Doxyfile
    5.14  lemon/lemon.pc
    5.15  ])