Changeset 1242


Ignore:
Timestamp:
Oct 3, 2009 2:50:57 PM (10 years ago)
Author:
stefan
Message:

rerun autotools; OsiCpx?.hpp does not include cplex.h anymore - need to do by ourself

Location:
trunk/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r1210 r1242  
    2133921339ac_compiler_gnu=$ac_cv_c_compiler_gnu
    2134021340
    21341            for fnm in MSK_openmosek ; do
     21341           for fnm in MSK_makeenv ; do
    2134221342             echo "$as_me:$LINENO: checking whether symbol $fnm is available with MSK" >&5
    2134321343echo $ECHO_N "checking whether symbol $fnm is available with MSK... $ECHO_C" >&6
     
    2140221402             LIBS="$coin_save_LIBS"
    2140321403           else
    21404              { { echo "$as_me:$LINENO: error: Cannot find symbol(s) MSK_openmosek with MSK" >&5
    21405 echo "$as_me: error: Cannot find symbol(s) MSK_openmosek with MSK" >&2;}
     21404             { { echo "$as_me:$LINENO: error: Cannot find symbol(s) MSK_makeenv with MSK" >&5
     21405echo "$as_me: error: Cannot find symbol(s) MSK_makeenv with MSK" >&2;}
    2140621406   { (exit 1); exit 1; }; }
    2140721407           fi
     
    2181021810ac_compiler_gnu=$ac_cv_c_compiler_gnu
    2181121811
    21812            for fnm in XPRSsetintcontrol ; do
     21812           for fnm in XPRSinit ; do
    2181321813             echo "$as_me:$LINENO: checking whether symbol $fnm is available with XPR" >&5
    2181421814echo $ECHO_N "checking whether symbol $fnm is available with XPR... $ECHO_C" >&6
     
    2187321873             LIBS="$coin_save_LIBS"
    2187421874           else
    21875              { { echo "$as_me:$LINENO: error: Cannot find symbol(s) XPRSsetintcontrol with XPR" >&5
    21876 echo "$as_me: error: Cannot find symbol(s) XPRSsetintcontrol with XPR" >&2;}
     21875             { { echo "$as_me:$LINENO: error: Cannot find symbol(s) XPRSinit with XPR" >&5
     21876echo "$as_me: error: Cannot find symbol(s) XPRSinit with XPR" >&2;}
    2187721877   { (exit 1); exit 1; }; }
    2187821878           fi
  • trunk/Cbc/src/CbcModel.cpp

    r1240 r1242  
    11211121#ifdef COIN_HAS_CPX
    11221122#include "OsiCpxSolverInterface.hpp"
     1123#include "cplex.h"
    11231124#endif
    11241125void CbcModel::branchAndBound(int doStatistics)
Note: See TracChangeset for help on using the changeset viewer.