Fix buggy include logic in lemon/lp.h (#503)
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 09 Jul 2014 14:41:36 +0200
changeset 13235de6a70446f6
parent 1322 1552352f9798
child 1325 1d80ec7d17eb
child 1330 1ad592289f93
Fix buggy include logic in lemon/lp.h (#503)
lemon/lp.h
     1.1 --- a/lemon/lp.h	Wed Jul 09 14:40:32 2014 +0200
     1.2 +++ b/lemon/lp.h	Wed Jul 09 14:41:36 2014 +0200
     1.3 @@ -22,15 +22,19 @@
     1.4  #include<lemon/config.h>
     1.5  
     1.6  
     1.7 -#ifdef LEMON_HAVE_GLPK
     1.8 +#if LEMON_DEFAULT_LP == _LEMON_GLPK || LEMON_DEFAULT_MIP == _LEMON_GLPK
     1.9  #include <lemon/glpk.h>
    1.10 -#elif LEMON_HAVE_CPLEX
    1.11 +#endif
    1.12 +#if LEMON_DEFAULT_LP == _LEMON_CPLEX || LEMON_DEFAULT_MIP == _LEMON_CPLEX 
    1.13  #include <lemon/cplex.h>
    1.14 -#elif LEMON_HAVE_SOPLEX
    1.15 +#endif
    1.16 +#if LEMON_DEFAULT_LP == _LEMON_SOPLEX
    1.17  #include <lemon/soplex.h>
    1.18 -#elif LEMON_HAVE_CLP
    1.19 +#endif
    1.20 +#if LEMON_DEFAULT_LP == _LEMON_CLP
    1.21  #include <lemon/clp.h>
    1.22 -#elif LEMON_HAVE_CBC
    1.23 +#endif
    1.24 +#if LEMON_DEFAULT_MIP == _LEMON_CBC
    1.25  #include <lemon/cbc.h>
    1.26  #endif
    1.27