Changeset 1138:f95b18d99843 in lemon-main

Timestamp:

05/06/15 11:31:43 (10 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

1136:20f95cd51aba (diff), 1137: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.

Phase:

public

Message:

Merge CMP0026 setting

Files:

• CMakeLists.txt (modified) (1 diff)
• CMakeLists.txt (modified) (3 diffs)

CMakeLists.txt

@@ -8 +8 @@
   CMAKE_POLICY(SET CMP0043 OLD) 
 ENDIF(POLICY CMP0043)
+
+IF(POLICY CMP0026)
+  #This is for copying the dll's needed by glpk (in lp_test and mip_test)
+  CMAKE_POLICY(SET CMP0026 OLD) 
+ENDIF(POLICY CMP0026)
 
 SET(PROJECT_NAME "LEMON")

CMakeLists.txt

@@ -4 +4 @@
   CMAKE_POLICY(SET CMP0048 OLD) 
 ENDIF(POLICY CMP0048)
+
+IF(POLICY CMP0043) 
+  CMAKE_POLICY(SET CMP0043 OLD) 
+ENDIF(POLICY CMP0043)
 
 IF(POLICY CMP0026)
@@ -235 +239 @@
     FORCE )
 
+SET_DIRECTORY_PROPERTIES(PROPERTIES
+  COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG"
+  COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG"
+)
 
 INCLUDE(CheckTypeSize)
@@ -263 +271 @@
 
 ENABLE_TESTING()
+
+
+INCLUDE(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" LEMON_CXX11)
+IF(LEMON_CXX11)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ENDIF()
+
 
 IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")