COIN-OR::LEMON - Graph Library

Changeset 504:29cbdb01d5f0 in lemon


Ignore:
Timestamp:
01/23/09 17:39:28 (9 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.0
Parents:
500:2b6a20528f35 (diff), 503:64c2641286df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge build system updates

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r500 r504  
    11CMAKE_MINIMUM_REQUIRED(VERSION 2.6) 
    22 
    3 SET(PROJECT_NAME "LEMON") 
    4 SET(PROJECT_VERSION "hg-tip" CACHE STRING "The version string.") 
     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) 
    59 
    610PROJECT(${PROJECT_NAME}) 
     
    2832 
    2933IF(WIN32) 
    30   INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico 
    31     DESTINATION bin) 
    32 ENDIF(WIN32) 
    33  
    34 IF(WIN32) 
    3534  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME}) 
    36   SET(CPACK_PACKAGE_VENDOR 
    37     "EGRES - Egervary Research Group on Combinatorial Optimization") 
     35  SET(CPACK_PACKAGE_VENDOR "EGRES") 
    3836  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY 
    3937    "LEMON - Library of Efficient Models and Optimization in Networks") 
     
    4745    "${PROJECT_NAME} ${PROJECT_VERSION}") 
    4846 
    49   # Variables to generate a component-based installer. 
    50   #SET(CPACK_COMPONENTS_ALL headers library html_documentation) 
     47  SET(CPACK_COMPONENTS_ALL headers library html_documentation) 
    5148 
    52   #SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers") 
    53   #SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Static library") 
    54   #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation") 
     49  SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers") 
     50  SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library") 
     51  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation") 
    5552 
    56   #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION 
    57   #  "C++ header files for use with the LEMON library") 
    58   #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION 
    59   #  "Static library used to build programs with LEMON") 
    60   #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION 
    61   #  "Doxygen generated documentation") 
     53  SET(CPACK_COMPONENT_HEADERS_DESCRIPTION 
     54    "C++ header files") 
     55  SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION 
     56    "DLL and import library") 
     57  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION 
     58    "Doxygen generated documentation") 
    6259 
    63   #SET(CPACK_COMPONENT_HEADERS_DEPENDS library) 
     60  SET(CPACK_COMPONENT_HEADERS_DEPENDS library) 
    6461 
    65   #SET(CPACK_COMPONENT_HEADERS_GROUP "Development") 
    66   #SET(CPACK_COMPONENT_LIBRARY_GROUP "Development") 
    67   #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation") 
     62  SET(CPACK_COMPONENT_HEADERS_GROUP "Development") 
     63  SET(CPACK_COMPONENT_LIBRARY_GROUP "Development") 
     64  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation") 
    6865 
    69   #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION 
    70   #  "Components needed to develop software using LEMON") 
    71   #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION 
    72   #  "Documentation of LEMON") 
     66  SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION 
     67    "Components needed to develop software using LEMON") 
     68  SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION 
     69    "Documentation of LEMON") 
    7370 
    74   #SET(CPACK_ALL_INSTALL_TYPES Full Developer) 
     71  SET(CPACK_ALL_INSTALL_TYPES Full Developer) 
    7572 
    76   #SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full) 
    77   #SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full) 
    78   #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full) 
     73  SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full) 
     74  SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full) 
     75  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full) 
    7976 
    8077  SET(CPACK_GENERATOR "NSIS") 
  • CMakeLists.txt

    r503 r504  
    1111 
    1212SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) 
     13 
     14IF(MSVC) 
     15  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996") 
     16# Suppressed warnings: 
     17# C4250: 'class1' : inherits 'class2::member' via dominance 
     18# C4355: 'this' : used in base member initializer list 
     19# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning) 
     20# C4996: 'function': was declared deprecated 
     21ENDIF(MSVC) 
    1322 
    1423INCLUDE(FindDoxygen) 
Note: See TracChangeset for help on using the changeset viewer.