0
3
0
... | ... |
@@ -14,25 +14,21 @@ |
14 | 14 |
INCLUDE(FindDoxygen) |
15 | 15 |
INCLUDE(FindGhostscript) |
16 | 16 |
FIND_PACKAGE(GLPK 4.33) |
17 | 17 |
FIND_PACKAGE(CPLEX) |
18 | 18 |
FIND_PACKAGE(COIN) |
19 | 19 |
|
20 |
ADD_DEFINITIONS(-DHAVE_CONFIG_H) |
|
21 |
|
|
22 | 20 |
IF(MSVC) |
23 | 21 |
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996") |
24 | 22 |
# Suppressed warnings: |
25 | 23 |
# C4250: 'class1' : inherits 'class2::member' via dominance |
26 | 24 |
# C4355: 'this' : used in base member initializer list |
27 | 25 |
# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning) |
28 | 26 |
# C4996: 'function': was declared deprecated |
29 | 27 |
ENDIF(MSVC) |
30 | 28 |
|
31 |
ADD_DEFINITIONS(-DHAVE_CONFIG_H) |
|
32 |
|
|
33 | 29 |
INCLUDE(CheckTypeSize) |
34 | 30 |
CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG) |
35 | 31 |
|
36 | 32 |
ENABLE_TESTING() |
37 | 33 |
|
38 | 34 |
ADD_SUBDIRECTORY(lemon) |
... | ... |
@@ -18,15 +18,13 @@ |
18 | 18 |
|
19 | 19 |
#include <sstream> |
20 | 20 |
#include <lemon/lp_skeleton.h> |
21 | 21 |
#include "test_tools.h" |
22 | 22 |
#include <lemon/tolerance.h> |
23 | 23 |
|
24 |
#ifdef HAVE_CONFIG_H |
|
25 | 24 |
#include <lemon/config.h> |
26 |
#endif |
|
27 | 25 |
|
28 | 26 |
#ifdef LEMON_HAVE_GLPK |
29 | 27 |
#include <lemon/glpk.h> |
30 | 28 |
#endif |
31 | 29 |
|
32 | 30 |
#ifdef LEMON_HAVE_CPLEX |
0 comments (0 inline)