COIN-OR::LEMON - Graph Library

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


Ignore:
Timestamp:
04/28/15 18:13:42 (5 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:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/config.h.in

    r1131 r1136  
     1#ifndef LEMON_CONFIG_H
     2#define LEMON_CONFIG_H
     3
    14#define LEMON_VERSION "@PROJECT_VERSION@"
    25#cmakedefine LEMON_HAVE_LONG_LONG 1
    36
    47#cmakedefine LEMON_CXX11 1
     8
     9#cmakedefine LEMON_WIN32 1
    510
    611#cmakedefine LEMON_HAVE_LP 1
     
    1217#cmakedefine LEMON_HAVE_CBC 1
    1318
    14 #define _LEMON_CPLEX 1
    15 #define _LEMON_CLP 2
    16 #define _LEMON_GLPK 3
    17 #define _LEMON_SOPLEX 4
    18 #define _LEMON_CBC 5
     19#define LEMON_CPLEX_ 1
     20#define LEMON_CLP_ 2
     21#define LEMON_GLPK_ 3
     22#define LEMON_SOPLEX_ 4
     23#define LEMON_CBC_ 5
    1924
    20 #cmakedefine LEMON_DEFAULT_LP _LEMON_@LEMON_DEFAULT_LP@
    21 #cmakedefine LEMON_DEFAULT_MIP _LEMON_@LEMON_DEFAULT_MIP@
     25#cmakedefine LEMON_DEFAULT_LP LEMON_@LEMON_DEFAULT_LP@_
     26#cmakedefine LEMON_DEFAULT_MIP LEMON_@LEMON_DEFAULT_MIP@_
    2227
    2328#cmakedefine LEMON_USE_PTHREAD 1
    2429#cmakedefine LEMON_USE_WIN32_THREADS 1
     30
     31#endif
  • lemon/config.h.in

    r1134 r1136  
    44#define LEMON_VERSION "@PROJECT_VERSION@"
    55#cmakedefine LEMON_HAVE_LONG_LONG 1
     6
     7#cmakedefine LEMON_CXX11 1
    68
    79#cmakedefine LEMON_WIN32 1
Note: See TracChangeset for help on using the changeset viewer.