- Timestamp:
- Dec 5, 2007 9:59:34 PM (13 years ago)
- Location:
- trunk/Cbc
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/configure
r835 r836 21117 21117 # header file, but that's not assumed. 21118 21118 21119 if test -r $MSKINCDIR/mosek dl.h; then21119 if test -r $MSKINCDIR/mosek.h; then 21120 21120 21121 21121 : 21122 21122 else 21123 { { echo "$as_me:$LINENO: error: Cannot find file mosek dl.h in $MSKINCDIR" >&521124 echo "$as_me: error: Cannot find file mosek dl.h in $MSKINCDIR" >&2;}21123 { { echo "$as_me:$LINENO: error: Cannot find file mosek.h in $MSKINCDIR" >&5 21124 echo "$as_me: error: Cannot find file mosek.h in $MSKINCDIR" >&2;} 21125 21125 { (exit 1); exit 1; }; } 21126 21126 : -
trunk/Cbc/configure.ac
r765 r836 73 73 AC_COIN_HAS_USER_LIBRARY([Cplex],[CPX],[cplex.h],[CPXgetstat]) 74 74 AC_COIN_HAS_USER_LIBRARY([FortMP],[FMP]) #ToDo! is Fortran? 75 AC_COIN_HAS_USER_LIBRARY([Mosek],[MSK],[mosek dl.h],[MSK_openmosek])75 AC_COIN_HAS_USER_LIBRARY([Mosek],[MSK],[mosek.h],[MSK_openmosek]) 76 76 AC_COIN_HAS_USER_LIBRARY([Osl],[OSL],[ekk_c_api.h],[ekk_simplex]) 77 77 AC_COIN_HAS_USER_LIBRARY([Soplex],[SPX],[spxsolver.h]) # ToDo -
trunk/Cbc/src/CbcGenSolvers.cpp
r640 r836 50 50 #endif 51 51 52 #ifdef COIN_HAS_MSK 53 # include "OsiMskSolverInterface.hpp" 54 # ifndef CBC_DEFAULT_SOLVER 55 # define CBC_DEFAULT_SOLVER "msk" 56 # endif 57 #endif 58 52 59 #include "CoinParam.hpp" 53 60 … … 115 122 # ifdef COIN_HAS_GLPK 116 123 solvers["glpk"] = new OsiGlpkSolverInterface ; 124 # endif 125 # ifdef COIN_HAS_MSK 126 solvers["msk"] = new OsiMskSolverInterface ; 117 127 # endif 118 128 /*
Note: See TracChangeset
for help on using the changeset viewer.