Changeset 1466 for trunk/Cbc/configure.ac
- Timestamp:
- Jun 9, 2010 6:25:35 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/configure.ac
r1464 r1466 68 68 AC_COIN_HAS_MODULE_FALLBACK(Osi, [osi], [../Osi], [dodefine=0 doconditional=0]) 69 69 AC_COIN_HAS_MODULE_FALLBACK(Cgl, [cgl], [../Cgl], [dodefine=0 doconditional=0]) 70 COINDEPEND_LIBS="$C OINUTILS_LIBS $BLAS_LIBS $LAPACK_LIBS $GLPK_LIBS $OSI_LIBS $CGL_LIBS"70 COINDEPEND_LIBS="$CGL_LIBS $OSI_LIBS $COINUTILS_LIBS $LAPACK_LIBS $BLAS_LIBS $GLPK_LIBS" 71 71 COINDEPEND_CFLAGS="$COINUTILS_CFLAGS $GLPK_CFLAGS $OSI_CFLAGS $CGL_CFLAGS" 72 72 if test "${coin_has_coinutils}${coin_has_osi}${coin_has_cgl}" = yesyesyes ; then … … 113 113 AC_COIN_HAS_MODULE(Grb, [osi-gurobi]) 114 114 AC_COIN_HAS_MODULE(Msk, [osi-mosek]) 115 #AC_COIN_HAS_MODULE(Spx, [osi-soplex])115 AC_COIN_HAS_MODULE(Spx, [osi-soplex]) 116 116 AC_COIN_HAS_MODULE(Xpr, [osi-xpress]) 117 117 … … 156 156 157 157 case $cbc_default_solver in 158 clp) 159 ;; 160 dylp) 161 ;; 162 glpk) 163 ;; 164 *) 165 AC_MSG_WARN([Unrecognised solver $cbc_default_solver chosen as cbc-generic default solver.]) 166 ;; 158 clp) 159 ;; 160 dylp) 161 ;; 162 glpk) 163 ;; 164 soplex) 165 ;; 166 *) 167 AC_MSG_WARN([Unrecognised solver $cbc_default_solver chosen as cbc-generic default solver.]) 168 ;; 167 169 esac 168 170 AC_DEFINE_UNQUOTED([CBC_DEFAULT_SOLVER],"$cbc_default_solver", … … 262 264 osi_exists_solver=${coin_has_msk-"unavailable"} 263 265 ;; 266 @<:@Ss@:>@@<:@Pp@:>@@<:@Xx@:>@*) 267 osi_lc_solver=spx ; 268 osi_mc_solver=Spx 269 osi_uc_solver=SPX 270 osi_exists_solver=${coin_has_spx-"unavailable"} 271 ;; 264 272 @<:@Ss@:>@@<:@Yy@:>@@<:@Mm@:>@*) 265 273 osi_lc_solver=sym ; … … 316 324 AM_CONDITIONAL([OSICBC_DFLT_SOLVER_GRB],[test $osi_mc_solver = Grb]) 317 325 AM_CONDITIONAL([OSICBC_DFLT_SOLVER_MSK],[test $osi_mc_solver = Msk]) 326 AM_CONDITIONAL([OSICBC_DFLT_SOLVER_SPX],[test $osi_mc_solver = Spx]) 318 327 AM_CONDITIONAL([OSICBC_DFLT_SOLVER_SYM],[test $osi_mc_solver = Sym]) 319 328 AM_CONDITIONAL([OSICBC_DFLT_SOLVER_VOL],[test $osi_mc_solver = Vol])
Note: See TracChangeset
for help on using the changeset viewer.