COIN-OR::LEMON - Graph Library

Changeset 1335:39b6e65574c6 in lemon


Ignore:
Timestamp:
04/02/15 22:34:03 (5 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1333:27d7d232fbcc (diff), 1334:ee96cd1cad8a (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.
Phase:
public
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r1327 r1335  
    44  CMAKE_POLICY(SET CMP0048 OLD)
    55ENDIF(POLICY CMP0048)
     6
     7IF(POLICY CMP0043)
     8  CMAKE_POLICY(SET CMP0043 OLD)
     9ENDIF(POLICY CMP0043)
    610
    711SET(PROJECT_NAME "LEMON")
     
    226230    FORCE )
    227231
     232SET_DIRECTORY_PROPERTIES(PROPERTIES
     233  COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG"
     234  COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG"
     235)
    228236
    229237INCLUDE(CheckTypeSize)
  • CMakeLists.txt

    r1334 r1335  
    1 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
     1CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
     2
     3IF(POLICY CMP0048)
     4  CMAKE_POLICY(SET CMP0048 OLD)
     5ENDIF(POLICY CMP0048)
    26
    37IF(POLICY CMP0043)
     
    126130  SET(LEMON_DEFAULT_LP ${DEFAULT_LP} CACHE STRING
    127131    "Default LP solver backend (GLPK, CPLEX, CLP or SOPLEX)" FORCE)
     132ELSE()
     133  SET(LEMON_DEFAULT_LP ${DEFAULT_LP} CACHE STRING
     134    "Default LP solver backend (GLPK, CPLEX, CLP or SOPLEX)")
    128135ENDIF()
    129136IF(NOT LEMON_DEFAULT_MIP OR
     
    133140  SET(LEMON_DEFAULT_MIP ${DEFAULT_MIP} CACHE STRING
    134141    "Default MIP solver backend (GLPK, CPLEX or CBC)" FORCE)
     142ELSE()
     143  SET(LEMON_DEFAULT_MIP ${DEFAULT_MIP} CACHE STRING
     144    "Default MIP solver backend (GLPK, CPLEX or CBC)")
    135145ENDIF()
    136146
     
    145155  ELSEIF(MSVC)
    146156    # This part is unnecessary 'casue the same is set by the lemon/core.h.
    147     # Still keep it as an example.
    148     SET(CXX_WARNING "/wd4250 /wd4355 /wd4503 /wd4800 /wd4996")
     157    # Still kept as an example.
     158
     159    # SET(CXX_WARNING "/wd4250 /wd4267 /wd4355 /wd4503 /wd4800 /wd4996")
     160
    149161    # Suppressed warnings:
    150162    # C4250: 'class1' : inherits 'class2::member' via dominance
     163    # C4267: conversion from 'size_t' to 'type', possible loss of data
    151164    # C4355: 'this' : used in base member initializer list
    152165    # C4503: 'function' : decorated name length exceeded, name was truncated
     
    163176
    164177IF(MSVC)
     178  SET(CMAKE_CXX_FLAGS "/bigobj ${CMAKE_CXX_FLAGS}")
    165179  SET( CMAKE_CXX_FLAGS_MAINTAINER "/WX ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING
    166180    "Flags used by the C++ compiler during maintainer builds."
     
    185199    )
    186200  SET( CMAKE_EXE_LINKER_FLAGS_MAINTAINER
    187     "-Wl,--warn-unresolved-symbols,--warn-once" CACHE STRING
     201    "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING
    188202    "Flags used for linking binaries during maintainer builds."
    189203    )
    190204  SET( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER
    191     "-Wl,--warn-unresolved-symbols,--warn-once" CACHE STRING
     205    "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE STRING
    192206    "Flags used by the shared libraries linker during maintainer builds."
    193207    )
Note: See TracChangeset for help on using the changeset viewer.