Changeset 1136:20f95cd51aba in lemon-main for lemon/config.h.in

Timestamp:

04/28/15 18:13:42 (9 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

1133:93d455c647be (diff), 1135:c199e9976d93 (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 bugfix #595

Files:

• lemon/config.h.in (modified) (2 diffs)
• lemon/config.h.in (modified) (1 diff)

lemon/config.h.in

@@ +1 @@
+#ifndef LEMON_CONFIG_H
+#define LEMON_CONFIG_H
+
 #define LEMON_VERSION "@PROJECT_VERSION@"
 #cmakedefine LEMON_HAVE_LONG_LONG 1
 
 #cmakedefine LEMON_CXX11 1
+
+#cmakedefine LEMON_WIN32 1
 
 #cmakedefine LEMON_HAVE_LP 1
@@ -12 +17 @@
 #cmakedefine LEMON_HAVE_CBC 1
 
-#define _LEMON_CPLEX 1
-#define _LEMON_CLP 2
-#define _LEMON_GLPK 3
-#define _LEMON_SOPLEX 4
-#define _LEMON_CBC 5
+#define LEMON_CPLEX_ 1
+#define LEMON_CLP_ 2
+#define LEMON_GLPK_ 3
+#define LEMON_SOPLEX_ 4
+#define LEMON_CBC_ 5
 
-#cmakedefine LEMON_DEFAULT_LP _LEMON_@LEMON_DEFAULT_LP@
-#cmakedefine LEMON_DEFAULT_MIP _LEMON_@LEMON_DEFAULT_MIP@
+#cmakedefine LEMON_DEFAULT_LP LEMON_@LEMON_DEFAULT_LP@_
+#cmakedefine LEMON_DEFAULT_MIP LEMON_@LEMON_DEFAULT_MIP@_
 
 #cmakedefine LEMON_USE_PTHREAD 1
 #cmakedefine LEMON_USE_WIN32_THREADS 1
+
+#endif

lemon/config.h.in

@@ -4 +4 @@
 #define LEMON_VERSION "@PROJECT_VERSION@"
 #cmakedefine LEMON_HAVE_LONG_LONG 1
+
+#cmakedefine LEMON_CXX11 1
 
 #cmakedefine LEMON_WIN32 1