Changeset 748
- Timestamp:
- Aug 12, 2007 7:06:57 AM (13 years ago)
- Location:
- branches/BSP/trunk/Cbc
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/BSP/trunk/Cbc/configure
r733 r748 2809 2809 xlc* | */xlc* | mpxlc* | */mpxlc*) 2810 2810 coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1" 2811 coin_add_cflags="-bmaxdata:0x80000000 "2811 coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036,1500-029" 2812 2812 coin_dbg_cflags="-g" 2813 2813 ;; … … 3650 3650 xlC* | */xlC* | mpxlC* | */mpxlC*) 3651 3651 coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1" 3652 coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna "3652 coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036,1500-029" 3653 3653 coin_dbg_cxxflags="-g" 3654 3654 ;; -
branches/BSP/trunk/Cbc/src/CbcGeneric.cpp
r745 r748 64 64 65 65 } 66 67 /*68 We need a local dummy of this to satisfy libCbc when linking. FIXME: But why69 only for the optimised build?70 */71 void CbcClpUnitTest (const CbcModel & saveModel, std::string& miplibDir)72 { return ; }73 66 74 67 namespace CbcGenSolvers -
branches/BSP/trunk/Cbc/src/Makefile.am
r735 r748 48 48 CbcLinked.cpp CbcLinked.hpp \ 49 49 CbcTreeLocal.cpp CbcTreeLocal.hpp \ 50 ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp 50 ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp \ 51 unitTestClp.cpp 52 #Stefan: added unitTestClp.cpp because CbcSolver defines reference to it 51 53 52 54 ## If we have the Ampl solver library, we need to add additional things -
branches/BSP/trunk/Cbc/src/Makefile.in
r735 r748 166 166 CbcModel.lo CbcNode.lo CbcSolver.lo CbcCbcParam.lo \ 167 167 CbcStatistics.lo CbcStrategy.lo CbcTree.lo CbcLinked.lo \ 168 CbcTreeLocal.lo ClpAmplStuff.lo Cbc_ampl.lo168 CbcTreeLocal.lo ClpAmplStuff.lo unitTestClp.lo Cbc_ampl.lo 169 169 libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS) 170 170 @COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT) … … 478 478 479 479 # List all source files for this library, including headers 480 #Stefan: added unitTestClp.cpp because CbcSolver defines reference to it 480 481 libCbc_la_SOURCES = Cbc_C_Interface.cpp Cbc_C_Interface.h CbcConfig.h \ 481 482 CbcBranchActual.cpp CbcBranchActual.hpp CbcBranchBase.cpp \ … … 498 499 CbcTree.hpp CbcLinked.cpp CbcLinked.hpp CbcTreeLocal.cpp \ 499 500 CbcTreeLocal.hpp ClpConstraintAmpl.hpp ClpAmplObjective.hpp \ 500 ClpAmplStuff.cpp Cbc_ampl.cpp Cbc_ampl.h501 ClpAmplStuff.cpp unitTestClp.cpp Cbc_ampl.cpp Cbc_ampl.h 501 502 502 503 # This is for libtool (on Windows) … … 777 778 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpAmplStuff.Plo@am__quote@ 778 779 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolve.Po@am__quote@ 780 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Plo@am__quote@ 779 781 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Po@am__quote@ 780 782
Note: See TracChangeset
for help on using the changeset viewer.