Changeset 289 for trunk


Ignore:
Timestamp:
Mar 27, 2006 6:27:16 PM (14 years ago)
Author:
lou
Message:

General cleanup.

Location:
trunk/Test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Test/Makefile

    r17 r289  
    1313.DELETE_ON_ERROR:
    1414
    15 .PHONY: default clean unitTest libdepend
     15.PHONY: default clean cbc solver
    1616
    17 default: unitTest
     17default: solver
    1818
    19 libdepend :
    20         (cd .. && ${MAKE} install)
    2119
    22 unitTest: libdepend
    23         ${MAKE} -f Makefile.test $*
     20cbc:
     21        (cd $(CoinDir)/Osi/OsiCbc && $(MAKE) -f Makefile.lightweight install)
     22        ${MAKE} -f Makefile.test $@
    2423
    25 solver: libdepend
    26         ${MAKE} -f Makefile.solve $*
     24solver:
     25        ${MAKE} -f Makefile.solve $@
    2726
    2827clean:
  • trunk/Test/Makefile.test

    r280 r289  
    2525Define := $(CBC_DEFINES)
    2626
     27
    2728# Cbc should build without OsiCbc, but you can't run the miplib test suite
    2829# without it.
    2930
    30 CBC_SOLVERS += Cbc
    31 
    32 $(warning CBC_SOLVERS is $(CBC_SOLVERS))
    33 
    3431ifneq ($(filter COIN_libOsiCbc,$(CoinLibsDefined)),)
    3532  CXXFLAGS += -DCBC_USE_CBC
     33  CBC_SOLVERS += Cbc
    3634else
    3735  $(warning OsiCbc not enabled in CoinLibsDefined. You will not be able to)
     
    4038endif
    4139
    42 # Add the requested solver libraries: libXXX and libOsiXXX
     40$(warning CBC_SOLVERS is $(CBC_SOLVERS))
     41
     42# Add the requested solver libraries: libXXX and libOsiXXX. If Clp is in the
     43# mix, and COIN_HAS_VOL is defined, we need to bring libVol into the mix (but
     44# not OsiVol).
    4345
    4446IncDir += $(foreach lib,$(CBC_SOLVERS),$($(lib)IncDir))
    4547LibDir += $(foreach lib,$(CBC_SOLVERS),$($(lib)LibDir))
    4648LibName += $(foreach lib,$(CBC_SOLVERS),$($(lib)LibName))
     49ifneq ($(filter COIN_libVol,$(CoinLibsDefined)),)
     50  LibDir += $(VolLibDir)
     51  LibName += $(VolLibName)
     52endif
    4753Define += $(foreach lib,$(CBC_SOLVERS),$($(lib)Define))
    4854IncDir += $(foreach lib,$(CBC_SOLVERS),$(Osi$(lib)IncDir))
     
    7682LibDir := $(sort $(LibDir))
    7783
    78 # Uncomment these to see just what's been ordered for the build.
     84# Uncomment these to see what's been ordered for the build.
    7985
    8086# $(warning IncDir is $(IncDir))
     
    137143.DELETE_ON_ERROR:
    138144
    139 .PHONY: unitTest
     145.PHONY: cbc unitTest
    140146
    141 unitTest: $(TARGETDIR)/cbc
     147cbc unitTest: $(TARGETDIR)/cbc
    142148
    143149$(TARGETDIR)/cbc : $(TESTOBJ)
Note: See TracChangeset for help on using the changeset viewer.