1.1 --- a/lemon/config.h.in	Tue Apr 08 15:41:56 2014 +0200
     1.2 +++ b/lemon/config.h.in	Tue Apr 08 15:43:12 2014 +0200
     1.3 @@ -1,5 +1,6 @@
     1.4  #define LEMON_VERSION "@PROJECT_VERSION@"
     1.5  #cmakedefine LEMON_HAVE_LONG_LONG 1
     1.6 +
     1.7  #cmakedefine LEMON_HAVE_LP 1
     1.8  #cmakedefine LEMON_HAVE_MIP 1
     1.9  #cmakedefine LEMON_HAVE_GLPK 1
    1.10 @@ -7,7 +8,15 @@
    1.11  #cmakedefine LEMON_HAVE_SOPLEX 1
    1.12  #cmakedefine LEMON_HAVE_CLP 1
    1.13  #cmakedefine LEMON_HAVE_CBC 1
    1.14 -#cmakedefine LEMON_DEFAULT_LP @LEMON_DEFAULT_LP@
    1.15 -#cmakedefine LEMON_DEFAULT_MIP @LEMON_DEFAULT_MIP@
    1.16 +
    1.17 +#define _LEMON_CPLEX 1
    1.18 +#define _LEMON_CLP 2
    1.19 +#define _LEMON_GLPK 3
    1.20 +#define _LEMON_SOPLEX 4
    1.21 +#define _LEMON_CBC 5
    1.22 +
    1.23 +#cmakedefine LEMON_DEFAULT_LP _LEMON_@LEMON_DEFAULT_LP@
    1.24 +#cmakedefine LEMON_DEFAULT_MIP _LEMON_@LEMON_DEFAULT_MIP@
    1.25 +
    1.26  #cmakedefine LEMON_USE_PTHREAD 1
    1.27  #cmakedefine LEMON_USE_WIN32_THREADS 1

     2.1 --- a/lemon/lp.h	Tue Apr 08 15:41:56 2014 +0200
     2.2 +++ b/lemon/lp.h	Tue Apr 08 15:43:12 2014 +0200
     2.3 @@ -45,8 +45,8 @@
     2.4    ///The default LP solver identifier.
     2.5    ///\ingroup lp_group
     2.6    ///
     2.7 -  ///Currently, the possible values are \c GLPK, \c CPLEX,
     2.8 -  ///\c SOPLEX or \c CLP
     2.9 +  ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX,
    2.10 +  ///\c _LEMON_SOPLEX or \c LEMON__CLP
    2.11  #define LEMON_DEFAULT_LP SOLVER
    2.12    ///The default LP solver
    2.13  
    2.14 @@ -61,7 +61,8 @@
    2.15    ///The default MIP solver identifier.
    2.16    ///\ingroup lp_group
    2.17    ///
    2.18 -  ///Currently, the possible values are \c GLPK, \c CPLEX or \c CBC
    2.19 +  ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX
    2.20 +  ///or \c _LEMON_CBC
    2.21  #define LEMON_DEFAULT_MIP SOLVER
    2.22    ///The default MIP solver.
    2.23  
    2.24 @@ -71,20 +72,20 @@
    2.25    ///Currently, it is either \c GlpkMip, \c CplexMip , \c CbcMip
    2.26    typedef GlpkMip Mip;
    2.27  #else
    2.28 -#if LEMON_DEFAULT_LP == GLPK
    2.29 +#if LEMON_DEFAULT_LP == _LEMON_GLPK
    2.30    typedef GlpkLp Lp;
    2.31 -#elif LEMON_DEFAULT_LP == CPLEX
    2.32 +#elif LEMON_DEFAULT_LP == _LEMON_CPLEX
    2.33    typedef CplexLp Lp;
    2.34 -#elif LEMON_DEFAULT_LP == SOPLEX
    2.35 +#elif LEMON_DEFAULT_LP == _LEMON_SOPLEX
    2.36    typedef SoplexLp Lp;
    2.37 -#elif LEMON_DEFAULT_LP == CLP
    2.38 +#elif LEMON_DEFAULT_LP == _LEMON_CLP
    2.39    typedef ClpLp Lp;
    2.40  #endif
    2.41 -#if LEMON_DEFAULT_MIP == GLPK
    2.42 +#if LEMON_DEFAULT_MIP == _LEMON_GLPK
    2.43    typedef GlpkMip Mip;
    2.44 -#elif LEMON_DEFAULT_MIP == CPLEX
    2.45 +#elif LEMON_DEFAULT_MIP == _LEMON_CPLEX
    2.46    typedef CplexMip Mip;
    2.47 -#elif LEMON_DEFAULT_MIP == CBC
    2.48 +#elif LEMON_DEFAULT_MIP == _LEMON_CBC
    2.49    typedef CbcMip Mip;
    2.50  #endif
    2.51  #endif