Changeset 1531
- Timestamp:
- Nov 13, 2010 2:04:20 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/stable/2.6 (added) merged: 1530
- Property svn:mergeinfo changed
-
trunk/Cbc
- Property svn:mergeinfo changed
/stable/2.6/Cbc (added) merged: 1530
- Property svn:mergeinfo changed
-
trunk/Cbc/configure
r1524 r1531 20840 20840 20841 20841 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"` 20843 20843 coin_has_coindepend=notGiven 20844 20844 echo "$as_me:$LINENO: result: not given: $COINDEPEND_PKG_ERRORS" >&5 … … 21191 21191 21192 21192 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"` 21194 21194 coin_has_clp=notGiven 21195 21195 echo "$as_me:$LINENO: result: not given: $CLP_PKG_ERRORS" >&5 … … 21522 21522 21523 21523 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"` 21525 21525 coin_has_ositests=notGiven 21526 21526 echo "$as_me:$LINENO: result: not given: $OSITESTS_PKG_ERRORS" >&5 … … 21811 21811 21812 21812 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"` 21814 21814 coin_has_sample=notGiven 21815 21815 echo "$as_me:$LINENO: result: not given: $SAMPLE_PKG_ERRORS" >&5 … … 22100 22100 22101 22101 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"` 22103 22103 coin_has_netlib=notGiven 22104 22104 echo "$as_me:$LINENO: result: not given: $NETLIB_PKG_ERRORS" >&5 … … 22389 22389 22390 22390 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"` 22392 22392 coin_has_miplib3=notGiven 22393 22393 echo "$as_me:$LINENO: result: not given: $MIPLIB3_PKG_ERRORS" >&5 … … 22694 22694 22695 22695 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"` 22697 22697 coin_has_dylp=notGiven 22698 22698 echo "$as_me:$LINENO: result: not given: $DYLP_PKG_ERRORS" >&5 … … 23000 23000 23001 23001 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"` 23003 23003 coin_has_vol=notGiven 23004 23004 echo "$as_me:$LINENO: result: not given: $VOL_PKG_ERRORS" >&5 … … 23229 23229 23230 23230 23231 23232 23233 23234 23235 23231 23236 #check if user provided LIBS, CFLAGS, or DATA for module 23232 23237 if test $coin_has_cpx != skipping; then … … 23239 23244 CPX_LIBS="$withval" 23240 23245 23246 CBCLIB_PCLIBS="$withval $CBCLIB_PCLIBS" 23247 CBCLIB_LIBS="$withval $CBCLIB_LIBS" 23248 23241 23249 CBCGENERIC_PCLIBS="$withval $CBCGENERIC_PCLIBS" 23242 23250 CBCGENERIC_LIBS="$withval $CBCGENERIC_LIBS" … … 23251 23259 coin_has_cpx=yes 23252 23260 CPX_CFLAGS="-I`${CYGPATH_W} $withval`" 23261 CBCLIB_CFLAGS="$withval $CBCLIB_CFLAGS" 23253 23262 CBCGENERIC_CFLAGS="$withval $CBCGENERIC_CFLAGS" 23254 23263 … … 23294 23303 echo "$as_me:$LINENO: result: yes: $CPX_VERSIONS" >&5 23295 23304 echo "${ECHO_T}yes: $CPX_VERSIONS" >&6 23305 CBCLIB_PCREQUIRES="osi-cplex $CBCLIB_PCREQUIRES" 23296 23306 CBCGENERIC_PCREQUIRES="osi-cplex $CBCGENERIC_PCREQUIRES" 23297 23307 … … 23299 23309 23300 23310 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"` 23302 23312 coin_has_cpx=notGiven 23303 23313 echo "$as_me:$LINENO: result: not given: $CPX_PKG_ERRORS" >&5 … … 23318 23328 export PKG_CONFIG_PATH 23319 23329 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" 23321 23334 23322 23335 CBCGENERIC_CFLAGS="$CPX_CFLAGS $CBCGENERIC_CFLAGS" … … 23421 23434 23422 23435 23436 CBCLIB_PCREQUIRES="osi-cplex $CBCLIB_PCREQUIRES" 23437 CBCLIB_CFLAGS="$CPX_CFLAGS $CBCLIB_CFLAGS" 23438 CBCLIB_LIBS="$CPX_LIBS $CBCLIB_LIBS" 23439 23423 23440 CBCGENERIC_PCREQUIRES="osi-cplex $CBCGENERIC_PCREQUIRES" 23424 23441 CBCGENERIC_CFLAGS="$CPX_CFLAGS $CBCGENERIC_CFLAGS" … … 23439 23456 echo "$as_me: Cpx DATA is $CPX_DATA" >&6;} 23440 23457 fi 23458 23459 { echo "$as_me:$LINENO: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&5 23460 echo "$as_me: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&6;} 23461 { echo "$as_me:$LINENO: CbcLib LIBS are $CBCLIB_LIBS" >&5 23462 echo "$as_me: CbcLib LIBS are $CBCLIB_LIBS" >&6;} 23441 23463 23442 23464 { echo "$as_me:$LINENO: CbcGeneric CFLAGS are $CBCGENERIC_CFLAGS" >&5 … … 23494 23516 echo "$as_me: Cpx CFLAGS are $CPX_CFLAGS" >&6;} 23495 23517 fi 23518 23519 { echo "$as_me:$LINENO: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&5 23520 echo "$as_me: CbcLib CFLAGS are $CBCLIB_CFLAGS" >&6;} 23521 { echo "$as_me:$LINENO: CbcLib LIBS are $CBCLIB_LIBS" >&5 23522 echo "$as_me: CbcLib LIBS are $CBCLIB_LIBS" >&6;} 23496 23523 23497 23524 { echo "$as_me:$LINENO: CbcGeneric CFLAGS are $CBCGENERIC_CFLAGS" >&5 … … 23615 23642 23616 23643 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"` 23618 23645 coin_has_glpk=notGiven 23619 23646 echo "$as_me:$LINENO: result: not given: $GLPK_PKG_ERRORS" >&5 … … 23921 23948 23922 23949 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"` 23924 23951 coin_has_grb=notGiven 23925 23952 echo "$as_me:$LINENO: result: not given: $GRB_PKG_ERRORS" >&5 … … 24220 24247 24221 24248 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"` 24223 24250 coin_has_msk=notGiven 24224 24251 echo "$as_me:$LINENO: result: not given: $MSK_PKG_ERRORS" >&5 … … 24536 24563 24537 24564 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"` 24539 24566 coin_has_spx=notGiven 24540 24567 echo "$as_me:$LINENO: result: not given: $SPX_PKG_ERRORS" >&5 … … 24842 24869 24843 24870 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"` 24845 24872 coin_has_xpr=notGiven 24846 24873 echo "$as_me:$LINENO: result: not given: $XPR_PKG_ERRORS" >&5 … … 25137 25164 25138 25165 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"` 25140 25167 coin_has_asl=notGiven 25141 25168 echo "$as_me:$LINENO: result: not given: $ASL_PKG_ERRORS" >&5 -
trunk/Cbc/configure.ac
r1524 r1531 83 83 AC_COIN_CHECK_PACKAGE(DyLP, [osi-dylp], [CbcGeneric]) 84 84 AC_COIN_CHECK_PACKAGE(Vol, [osi-vol]) 85 AC_COIN_CHECK_PACKAGE(Cpx, [osi-cplex], [Cbc Generic])85 AC_COIN_CHECK_PACKAGE(Cpx, [osi-cplex], [CbcLib CbcGeneric]) 86 86 AC_COIN_CHECK_PACKAGE(Glpk, [osi-glpk], [CbcGeneric]) 87 87 AC_COIN_CHECK_PACKAGE(Grb, [osi-gurobi]) -
trunk/Cbc/src/Makefile.am
r1501 r1531 96 96 CbcTreeLocal.cpp CbcTreeLocal.hpp 97 97 98 99 98 libCbcSolver_la_SOURCES = \ 100 99 CbcCbcParam.cpp \ … … 115 114 116 115 bin_PROGRAMS = 117 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_ LIBS)116 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS) 118 117 119 118 ######################################################################## -
trunk/Cbc/src/Makefile.in
r1516 r1531 558 558 559 559 # List additional defines 560 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_ LIBS) \560 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS) \ 561 561 $(am__append_2) $(am__append_5) $(am__append_6) \ 562 562 -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
Note: See TracChangeset
for help on using the changeset viewer.