COIN-OR::LEMON - Graph Library

Changeset 1198:2236d00ca778 in lemon-main for CMakeLists.txt


Ignore:
Timestamp:
11/01/18 19:49:51 (5 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1196:959d78f3fe0e (diff), 1197:f179aa1045a4 (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 #615

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r1185 r1198  
    153153ENDIF()
    154154
     155IF( ( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
     156      ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER_EQUAL "4.8") )
     157    OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     158    OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     159    )
     160  SET(LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS TRUE)
     161ENDIF()
    155162
    156163IF(DEFINED ENV{LEMON_CXX_WARNING})
    157164  SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
    158165ELSE()
    159   IF(CMAKE_COMPILER_IS_GNUCXX)
     166  IF( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     167      OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     168      )
    160169    SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas")
     170    SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
     171    SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
     172  ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     173    SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -Wno-unknown-pragmas")
    161174    SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
    162175    SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
  • CMakeLists.txt

    r1197 r1198  
    44  CMAKE_POLICY(SET CMP0048 OLD)
    55ENDIF(POLICY CMP0048)
     6
     7IF(POLICY CMP0043)
     8  CMAKE_POLICY(SET CMP0043 OLD)
     9ENDIF(POLICY CMP0043)
    610
    711IF(POLICY CMP0026)
     
    247251    FORCE )
    248252
     253SET_DIRECTORY_PROPERTIES(PROPERTIES
     254  COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG"
     255  COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG"
     256)
    249257
    250258INCLUDE(CheckTypeSize)
     
    275283
    276284ENABLE_TESTING()
     285
     286
     287INCLUDE(CheckCXXCompilerFlag)
     288CHECK_CXX_COMPILER_FLAG("-std=c++11" LEMON_CXX11)
     289IF(LEMON_CXX11)
     290  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     291ENDIF()
     292
    277293
    278294IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
Note: See TracChangeset for help on using the changeset viewer.