COIN-OR::LEMON - Graph Library

Changeset 1128:426a704d7483 in lemon for CMakeLists.txt


Ignore:
Timestamp:
01/20/12 19:23:48 (8 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1124:b1744d7bdb47 (diff), 1125:b873350e6258 (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 Intel C++ compatibility fixes

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r1111 r1128  
    6767    # C4996: 'function': was declared deprecated
    6868  ELSE()
    69     SET(CXX_WARNING "-Wall -W")
     69    SET(CXX_WARNING "-Wall")
    7070  ENDIF()
    7171ENDIF()
     
    7474SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LEMON_CXX_WARNING_FLAGS}")
    7575
    76 SET( CMAKE_CXX_FLAGS_MAINTAINER "-Werror -ggdb" CACHE STRING
     76SET( CMAKE_CXX_FLAGS_MAINTAINER "-Werror -ggdb -O0" CACHE STRING
    7777    "Flags used by the C++ compiler during maintainer builds."
    7878    FORCE )
    79 SET( CMAKE_C_FLAGS_MAINTAINER "-Werror" CACHE STRING
     79SET( CMAKE_C_FLAGS_MAINTAINER "-Werror -O0" CACHE STRING
    8080    "Flags used by the C compiler during maintainer builds."
    8181    FORCE )
  • CMakeLists.txt

    r1125 r1128  
    125125ADD_SUBDIRECTORY(lemon)
    126126IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
     127  ADD_SUBDIRECTORY(contrib)
    127128  ADD_SUBDIRECTORY(demo)
    128129  ADD_SUBDIRECTORY(tools)
Note: See TracChangeset for help on using the changeset viewer.