Changeset 1531


Ignore:
Timestamp:
Nov 13, 2010 2:04:20 PM (9 years ago)
Author:
tkr
Message:

Merging r1530 from stable/2.6

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/Cbc

  • trunk/Cbc/configure

    r1524 r1531  
    2084020840
    2084120841  else
    20842     COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors cgl osi coinutils`
     20842    COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "cgl osi coinutils"`
    2084320843      coin_has_coindepend=notGiven
    2084420844        echo "$as_me:$LINENO: result: not given: $COINDEPEND_PKG_ERRORS" >&5
    … …  
    2119121191
    2119221192  else
    21193     CLP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-clp`
     21193    CLP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-clp"`
    2119421194      coin_has_clp=notGiven
    2119521195        echo "$as_me:$LINENO: result: not given: $CLP_PKG_ERRORS" >&5
    … …  
    2152221522
    2152321523  else
    21524     OSITESTS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-unittests`
     21524    OSITESTS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-unittests"`
    2152521525      coin_has_ositests=notGiven
    2152621526        echo "$as_me:$LINENO: result: not given: $OSITESTS_PKG_ERRORS" >&5
    … …  
    2181121811
    2181221812  else
    21813     SAMPLE_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coindatasample`
     21813    SAMPLE_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatasample"`
    2181421814      coin_has_sample=notGiven
    2181521815        echo "$as_me:$LINENO: result: not given: $SAMPLE_PKG_ERRORS" >&5
    … …  
    2210022100
    2210122101  else
    22102     NETLIB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coindatanetlib`
     22102    NETLIB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatanetlib"`
    2210322103      coin_has_netlib=notGiven
    2210422104        echo "$as_me:$LINENO: result: not given: $NETLIB_PKG_ERRORS" >&5
    … …  
    2238922389
    2239022390  else
    22391     MIPLIB3_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coindatamiplib3`
     22391    MIPLIB3_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coindatamiplib3"`
    2239222392      coin_has_miplib3=notGiven
    2239322393        echo "$as_me:$LINENO: result: not given: $MIPLIB3_PKG_ERRORS" >&5
    … …  
    2269422694
    2269522695  else
    22696     DYLP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-dylp`
     22696    DYLP_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-dylp"`
    2269722697      coin_has_dylp=notGiven
    2269822698        echo "$as_me:$LINENO: result: not given: $DYLP_PKG_ERRORS" >&5
    … …  
    2300023000
    2300123001  else
    23002     VOL_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-vol`
     23002    VOL_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-vol"`
    2300323003      coin_has_vol=notGiven
    2300423004        echo "$as_me:$LINENO: result: not given: $VOL_PKG_ERRORS" >&5
    … …  
    2322923229
    2323023230
     23231
     23232
     23233
     23234
     23235
    2323123236#check if user provided LIBS, CFLAGS, or DATA for module
    2323223237if test $coin_has_cpx != skipping; then
    … …  
    2323923244       CPX_LIBS="$withval"
    2324023245
     23246         CBCLIB_PCLIBS="$withval $CBCLIB_PCLIBS"
     23247         CBCLIB_LIBS="$withval $CBCLIB_LIBS"
     23248
    2324123249         CBCGENERIC_PCLIBS="$withval $CBCGENERIC_PCLIBS"
    2324223250         CBCGENERIC_LIBS="$withval $CBCGENERIC_LIBS"
    … …  
    2325123259  coin_has_cpx=yes
    2325223260     CPX_CFLAGS="-I`${CYGPATH_W} $withval`"
     23261     CBCLIB_CFLAGS="$withval $CBCLIB_CFLAGS"
    2325323262     CBCGENERIC_CFLAGS="$withval $CBCGENERIC_CFLAGS"
    2325423263
    … …  
    2329423303        echo "$as_me:$LINENO: result: yes: $CPX_VERSIONS" >&5
    2329523304echo "${ECHO_T}yes: $CPX_VERSIONS" >&6
     23305        CBCLIB_PCREQUIRES="osi-cplex $CBCLIB_PCREQUIRES"
    2329623306        CBCGENERIC_PCREQUIRES="osi-cplex $CBCGENERIC_PCREQUIRES"
    2329723307
    … …  
    2329923309
    2330023310  else
    23301     CPX_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-cplex`
     23311    CPX_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-cplex"`
    2330223312      coin_has_cpx=notGiven
    2330323313        echo "$as_me:$LINENO: result: not given: $CPX_PKG_ERRORS" >&5
    … …  
    2331823328    export PKG_CONFIG_PATH
    2331923329
    23320     # augment X_CFLAGS and X_LIBS for each build target X in CbcGeneric
     23330    # augment X_CFLAGS and X_LIBS for each build target X in CbcLib CbcGeneric
     23331
     23332      CBCLIB_CFLAGS="$CPX_CFLAGS $CBCLIB_CFLAGS"
     23333      CBCLIB_LIBS="$CPX_LIBS $CBCLIB_LIBS"
    2332123334
    2332223335      CBCGENERIC_CFLAGS="$CPX_CFLAGS $CBCGENERIC_CFLAGS"
    … …  
    2342123434
    2342223435
     23436      CBCLIB_PCREQUIRES="osi-cplex $CBCLIB_PCREQUIRES"
     23437      CBCLIB_CFLAGS="$CPX_CFLAGS $CBCLIB_CFLAGS"
     23438      CBCLIB_LIBS="$CPX_LIBS $CBCLIB_LIBS"
     23439
    2342323440      CBCGENERIC_PCREQUIRES="osi-cplex $CBCGENERIC_PCREQUIRES"
    2342423441      CBCGENERIC_CFLAGS="$CPX_CFLAGS $CBCGENERIC_CFLAGS"
    … …  
    2343923456echo "$as_me: Cpx DATA   is  $CPX_DATA" >&6;}
    2344023457      fi
     23458
     23459        { echo "$as_me:$LINENO: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&5
     23460echo "$as_me: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&6;}
     23461        { echo "$as_me:$LINENO: CbcLib LIBS   are $CBCLIB_LIBS" >&5
     23462echo "$as_me: CbcLib LIBS   are $CBCLIB_LIBS" >&6;}
    2344123463
    2344223464        { echo "$as_me:$LINENO: CbcGeneric CFLAGS are $CBCGENERIC_CFLAGS" >&5
    … …  
    2349423516echo "$as_me: Cpx CFLAGS are $CPX_CFLAGS" >&6;}
    2349523517    fi
     23518
     23519      { echo "$as_me:$LINENO: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&5
     23520echo "$as_me: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&6;}
     23521      { echo "$as_me:$LINENO: CbcLib LIBS   are $CBCLIB_LIBS" >&5
     23522echo "$as_me: CbcLib LIBS   are $CBCLIB_LIBS" >&6;}
    2349623523
    2349723524      { echo "$as_me:$LINENO: CbcGeneric CFLAGS are $CBCGENERIC_CFLAGS" >&5
    … …  
    2361523642
    2361623643  else
    23617     GLPK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-glpk`
     23644    GLPK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-glpk"`
    2361823645      coin_has_glpk=notGiven
    2361923646        echo "$as_me:$LINENO: result: not given: $GLPK_PKG_ERRORS" >&5
    … …  
    2392123948
    2392223949  else
    23923     GRB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-gurobi`
     23950    GRB_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-gurobi"`
    2392423951      coin_has_grb=notGiven
    2392523952        echo "$as_me:$LINENO: result: not given: $GRB_PKG_ERRORS" >&5
    … …  
    2422024247
    2422124248  else
    24222     MSK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-mosek`
     24249    MSK_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-mosek"`
    2422324250      coin_has_msk=notGiven
    2422424251        echo "$as_me:$LINENO: result: not given: $MSK_PKG_ERRORS" >&5
    … …  
    2453624563
    2453724564  else
    24538     SPX_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-soplex`
     24565    SPX_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-soplex"`
    2453924566      coin_has_spx=notGiven
    2454024567        echo "$as_me:$LINENO: result: not given: $SPX_PKG_ERRORS" >&5
    … …  
    2484224869
    2484324870  else
    24844     XPR_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors osi-xpress`
     24871    XPR_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi-xpress"`
    2484524872      coin_has_xpr=notGiven
    2484624873        echo "$as_me:$LINENO: result: not given: $XPR_PKG_ERRORS" >&5
    … …  
    2513725164
    2513825165  else
    25139     ASL_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinasl`
     25166    ASL_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "coinasl"`
    2514025167      coin_has_asl=notGiven
    2514125168        echo "$as_me:$LINENO: result: not given: $ASL_PKG_ERRORS" >&5

  • trunk/Cbc/configure.ac

    r1524 r1531  
    8383AC_COIN_CHECK_PACKAGE(DyLP, [osi-dylp],   [CbcGeneric])
    8484AC_COIN_CHECK_PACKAGE(Vol,  [osi-vol])
    85 AC_COIN_CHECK_PACKAGE(Cpx,  [osi-cplex],  [CbcGeneric])
     85AC_COIN_CHECK_PACKAGE(Cpx,  [osi-cplex],  [CbcLib CbcGeneric])
    8686AC_COIN_CHECK_PACKAGE(Glpk, [osi-glpk],   [CbcGeneric])
    8787AC_COIN_CHECK_PACKAGE(Grb,  [osi-gurobi])

  • trunk/Cbc/src/Makefile.am

    r1501 r1531  
    9696        CbcTreeLocal.cpp CbcTreeLocal.hpp
    9797
    98 
    9998libCbcSolver_la_SOURCES = \
    10099        CbcCbcParam.cpp \
    … …  
    115114
    116115bin_PROGRAMS =
    117 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_LIBS)
     116AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS)
    118117
    119118########################################################################

  • trunk/Cbc/src/Makefile.in

    r1516 r1531  
    558558
    559559# List additional defines
    560 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_LIBS) \
     560AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS) \
    561561        $(am__append_2) $(am__append_5) $(am__append_6) \
    562562        -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
Note: See TracChangeset for help on using the changeset viewer.