COIN-OR::LEMON - Graph Library

Changeset 1346:f95b18d99843 in lemon


Ignore:
Timestamp:
05/06/15 11:31:43 (3 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1343:20f95cd51aba (diff), 1344:ca4e4a5e9b6e (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 CMP0026 setting

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r1343 r1346  
    88  CMAKE_POLICY(SET CMP0043 OLD)  
    99ENDIF(POLICY CMP0043) 
     10 
     11IF(POLICY CMP0026) 
     12  #This is for copying the dll's needed by glpk (in lp_test and mip_test) 
     13  CMAKE_POLICY(SET CMP0026 OLD)  
     14ENDIF(POLICY CMP0026) 
    1015 
    1116SET(PROJECT_NAME "LEMON") 
  • CMakeLists.txt

    r1344 r1346  
    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) 
     
    235239    FORCE ) 
    236240 
     241SET_DIRECTORY_PROPERTIES(PROPERTIES 
     242  COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG" 
     243  COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG" 
     244) 
    237245 
    238246INCLUDE(CheckTypeSize) 
     
    263271 
    264272ENABLE_TESTING() 
     273 
     274 
     275INCLUDE(CheckCXXCompilerFlag) 
     276CHECK_CXX_COMPILER_FLAG("-std=c++11" LEMON_CXX11) 
     277IF(LEMON_CXX11) 
     278  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") 
     279ENDIF() 
     280 
    265281 
    266282IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer") 
Note: See TracChangeset for help on using the changeset viewer.