Changeset 107


Ignore:
Timestamp:
Apr 13, 2005 9:48:23 AM (16 years ago)
Author:
forrest
Message:

OsiCbc? conditional

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r105 r107  
    2929        (cd $(CoinDir)/Coin && $(MAKE) install)
    3030        (cd $(CoinDir)/Clp && $(MAKE) install)
     31ifeq ($(VolDefine),COIN_HAS_VOL)
     32        (cd $(CoinDir)/Vol && $(MAKE) install)
     33endif
     34ifneq ($(filter COIN_libOsiClp,$(CoinLibsDefined)),)
    3135        (cd $(CoinDir)/Osi/OsiClp && $(MAKE) install)
     36endif
     37ifneq ($(filter COIN_libOsiCbc,$(CoinLibsDefined)),)
    3238        (cd $(CoinDir)/Osi/OsiCbc && $(MAKE) -f Makefile.lightweight install)
     39endif
    3340#       (cd $(CoinDir)/Osi/OsiDylp && $(MAKE) install)
    3441        (cd $(CoinDir)/Cgl && $(MAKE) install)
  • trunk/Test/Makefile.test

    r103 r107  
    3232
    3333LibDir := ${CbcLibDir} ${CglLibDir}
    34 LibDir += ${OsiClpLibDir} ${ClpLibDir}
     34LibDir += ${OsiClpLibDir} ${ClpLibDir} 
    3535#LibDir += ${OsiDylpLibDir} ${DylpLibDir}
    3636LibDir += ${OsiLibDir} ${CoinLibDir}
     
    4040LibName := $(OsiCbcLibName) ${CbcLibName} ${CglLibName}
    4141LibName += ${OsiClpLibName} ${ClpLibName}
     42ifeq ($(VolDefine),COIN_HAS_VOL)
     43LibName += $(VolLibName)
     44endif
    4245#LibName += ${OsiDylpLibName} ${DylpLibName}
    4346LibName += ${OsiLibName} ${CoinLibName}
     
    6972
    7073#tell parameter handling to allow for CbcModel and OsiSolverInterface
     74ifneq ($(filter COIN_libOsiCbc,$(CoinLibsDefined)),)
    7175CXXFLAGS += -DCOIN_USE_CBC
     76endif
    7277##############################################################################
    7378# You should not need to edit below this line.
  • trunk/Test/unitTest.cpp

    r101 r107  
    1414#include <cstdio>
    1515
     16#ifdef COIN_USE_CBC
    1617#include "OsiCbcSolverInterface.hpp"
     18#else
     19//#define OsiCbcSolverInterface OsiClpSolverInterface
     20#endif
    1721#ifdef COIN_USE_OSL
    1822#include "OsiOslSolverInterface.hpp"
     
    3842void testingMessage( const char * const msg );
    3943
     44#ifdef COIN_USE_CBC
    4045void CbcUnitTest (const std::vector<OsiCbcSolverInterface*> & vecEmptySiP,
    4146                  const std::string & mpsDir)
     
    288293  }
    289294}
    290 
     295#endif
    291296//----------------------------------------------------------------
    292297// unitTest  [-miplibDir=V2]
     
    348353  else
    349354    miplibDir = dirsep == '/' ? "./Samples/miplib3/" : ".\\Samples\\miplib3\\";
     355#ifdef COIN_USE_CBC
    350356
    351357  {
     
    381387      delete vecSi[i];
    382388  }
     389#endif
    383390  testingMessage( "All tests completed successfully\n" );
    384391  return 0;
Note: See TracChangeset for help on using the changeset viewer.