Changeset 1120:5de6a70446f6 in lemon-main

Timestamp:

07/09/14 14:41:36 (10 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

1121:1d80ec7d17eb, 1125:1ad592289f93

Phase:

public

Message:

Fix buggy include logic in lemon/lp.h (#503)

File:

• lemon/lp.h (modified) (1 diff)

lemon/lp.h

@@ -23 +23 @@
 
 
-#ifdef LEMON_HAVE_GLPK
+#if LEMON_DEFAULT_LP == _LEMON_GLPK || LEMON_DEFAULT_MIP == _LEMON_GLPK
 #include <lemon/glpk.h>
-#elif LEMON_HAVE_CPLEX
+#endif
+#if LEMON_DEFAULT_LP == _LEMON_CPLEX || LEMON_DEFAULT_MIP == _LEMON_CPLEX 
 #include <lemon/cplex.h>
-#elif LEMON_HAVE_SOPLEX
+#endif
+#if LEMON_DEFAULT_LP == _LEMON_SOPLEX
 #include <lemon/soplex.h>
-#elif LEMON_HAVE_CLP
+#endif
+#if LEMON_DEFAULT_LP == _LEMON_CLP
 #include <lemon/clp.h>
-#elif LEMON_HAVE_CBC
+#endif
+#if LEMON_DEFAULT_MIP == _LEMON_CBC
 #include <lemon/cbc.h>
 #endif