1.1 --- a/CMakeLists.txt	Wed Jan 22 15:34:29 2014 +0100
     1.2 +++ b/CMakeLists.txt	Tue Apr 08 15:57:42 2014 +0200
     1.3 @@ -1,4 +1,4 @@
     1.4 -CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
     1.5 +CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
     1.6  
     1.7  SET(PROJECT_NAME "LEMON")
     1.8  PROJECT(${PROJECT_NAME})

     2.1 --- a/lemon/config.h.in	Wed Jan 22 15:34:29 2014 +0100
     2.2 +++ b/lemon/config.h.in	Tue Apr 08 15:57:42 2014 +0200
     2.3 @@ -1,5 +1,6 @@
     2.4  #define LEMON_VERSION "@PROJECT_VERSION@"
     2.5  #cmakedefine LEMON_HAVE_LONG_LONG 1
     2.6 +
     2.7  #cmakedefine LEMON_HAVE_LP 1
     2.8  #cmakedefine LEMON_HAVE_MIP 1
     2.9  #cmakedefine LEMON_HAVE_GLPK 1
    2.10 @@ -7,7 +8,15 @@
    2.11  #cmakedefine LEMON_HAVE_SOPLEX 1
    2.12  #cmakedefine LEMON_HAVE_CLP 1
    2.13  #cmakedefine LEMON_HAVE_CBC 1
    2.14 -#cmakedefine LEMON_DEFAULT_LP @LEMON_DEFAULT_LP@
    2.15 -#cmakedefine LEMON_DEFAULT_MIP @LEMON_DEFAULT_MIP@
    2.16 +
    2.17 +#define _LEMON_CPLEX 1
    2.18 +#define _LEMON_CLP 2
    2.19 +#define _LEMON_GLPK 3
    2.20 +#define _LEMON_SOPLEX 4
    2.21 +#define _LEMON_CBC 5
    2.22 +
    2.23 +#cmakedefine LEMON_DEFAULT_LP _LEMON_@LEMON_DEFAULT_LP@
    2.24 +#cmakedefine LEMON_DEFAULT_MIP _LEMON_@LEMON_DEFAULT_MIP@
    2.25 +
    2.26  #cmakedefine LEMON_USE_PTHREAD 1
    2.27  #cmakedefine LEMON_USE_WIN32_THREADS 1

     3.1 --- a/lemon/lp.h	Wed Jan 22 15:34:29 2014 +0100
     3.2 +++ b/lemon/lp.h	Tue Apr 08 15:57:42 2014 +0200
     3.3 @@ -45,8 +45,8 @@
     3.4    ///The default LP solver identifier.
     3.5    ///\ingroup lp_group
     3.6    ///
     3.7 -  ///Currently, the possible values are \c GLPK, \c CPLEX,
     3.8 -  ///\c SOPLEX or \c CLP
     3.9 +  ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX,
    3.10 +  ///\c _LEMON_SOPLEX or \c LEMON__CLP
    3.11  #define LEMON_DEFAULT_LP SOLVER
    3.12    ///The default LP solver
    3.13  
    3.14 @@ -61,7 +61,8 @@
    3.15    ///The default MIP solver identifier.
    3.16    ///\ingroup lp_group
    3.17    ///
    3.18 -  ///Currently, the possible values are \c GLPK, \c CPLEX or \c CBC
    3.19 +  ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX
    3.20 +  ///or \c _LEMON_CBC
    3.21  #define LEMON_DEFAULT_MIP SOLVER
    3.22    ///The default MIP solver.
    3.23  
    3.24 @@ -71,20 +72,20 @@
    3.25    ///Currently, it is either \c GlpkMip, \c CplexMip , \c CbcMip
    3.26    typedef GlpkMip Mip;
    3.27  #else
    3.28 -#if LEMON_DEFAULT_LP == GLPK
    3.29 +#if LEMON_DEFAULT_LP == _LEMON_GLPK
    3.30    typedef GlpkLp Lp;
    3.31 -#elif LEMON_DEFAULT_LP == CPLEX
    3.32 +#elif LEMON_DEFAULT_LP == _LEMON_CPLEX
    3.33    typedef CplexLp Lp;
    3.34 -#elif LEMON_DEFAULT_LP == SOPLEX
    3.35 +#elif LEMON_DEFAULT_LP == _LEMON_SOPLEX
    3.36    typedef SoplexLp Lp;
    3.37 -#elif LEMON_DEFAULT_LP == CLP
    3.38 +#elif LEMON_DEFAULT_LP == _LEMON_CLP
    3.39    typedef ClpLp Lp;
    3.40  #endif
    3.41 -#if LEMON_DEFAULT_MIP == GLPK
    3.42 +#if LEMON_DEFAULT_MIP == _LEMON_GLPK
    3.43    typedef GlpkMip Mip;
    3.44 -#elif LEMON_DEFAULT_MIP == CPLEX
    3.45 +#elif LEMON_DEFAULT_MIP == _LEMON_CPLEX
    3.46    typedef CplexMip Mip;
    3.47 -#elif LEMON_DEFAULT_MIP == CBC
    3.48 +#elif LEMON_DEFAULT_MIP == _LEMON_CBC
    3.49    typedef CbcMip Mip;
    3.50  #endif
    3.51  #endif