Changeset 280 for trunk


Ignore:
Timestamp:
Mar 17, 2006 8:48:52 PM (14 years ago)
Author:
lou
Message:

Suppressed a few prints. Reorder libraries for static link (thanks, Pierre!).

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r277 r280  
    2424# CBC_SOLVERS := Clp Dylp
    2525
    26 CBC_SOLVERS := Clp
     26CBC_SOLVERS := Clp Dylp
    2727
    2828# Regardless of the number of solvers specified, it's a good idea to set the
     
    3232# letters (don't ask).
    3333
    34 cbcDefaultSolver := clp
     34cbcDefaultSolver := dylp
    3535
    3636###############################################################################
     
    7676export CBC_SOLVERS
    7777
    78 $(warning CBC_DEFINES is $(CBC_DEFINES))
     78# $(warning CBC_DEFINES is $(CBC_DEFINES))
    7979
    8080$(warning Building cbc with solvers $(CBC_SOLVERS))
  • trunk/Test/Makefile.test

    r277 r280  
    2525Define := $(CBC_DEFINES)
    2626
    27 # Tell parameter handling to allow for CbcModel and OsiSolverInterface. You
    28 # can't run the miplib test suite without OsiCbc.
     27# Cbc should build without OsiCbc, but you can't run the miplib test suite
     28# without it.
    2929
    3030CBC_SOLVERS += Cbc
     
    3636else
    3737  $(warning OsiCbc not enabled in CoinLibsDefined. You will not be able to)
    38   $(warning run the `cbc -miplib' command. Edit Makefile.location if you)
    39   $(warning to enable OsiCbc.)
     38  $(warning run the `cbc -miplib' command. Edit Makefile.location to enable)
     39  $(warning OsiCbc.)
    4040endif
    41 
    42 
    43 # Add the required libraries: Coin, Osi, Cgl
    44 
    45 IncDir += $(foreach lib,Coin Osi Cgl,$($(lib)IncDir))
    46 LibDir += $(foreach lib,Coin Osi Cgl,$($(lib)LibDir))
    47 LibName += $(foreach lib,Coin Osi Cgl,$($(lib)LibName))
    48 Define += $(foreach lib,Coin Osi Cgl,$($(lib)Define))
    4941
    5042# Add the requested solver libraries: libXXX and libOsiXXX
     
    5850LibName += $(foreach lib,$(CBC_SOLVERS),$(Osi$(lib)LibName))
    5951Define += $(foreach lib,$(CBC_SOLVERS),$(Osi$(lib)Define))
     52
     53# Add the required libraries: Coin, Osi, Cgl
     54
     55IncDir += $(foreach lib,Cgl Osi Coin,$($(lib)IncDir))
     56LibDir += $(foreach lib,Cgl Osi Coin,$($(lib)LibDir))
     57LibName += $(foreach lib,Cgl Osi Coin,$($(lib)LibName))
     58Define += $(foreach lib,Cgl Osi Coin,$($(lib)Define))
    6059
    6160# And a few other potentially useful libraries: z, bz, readline. Unfortunately
     
    7776LibDir := $(sort $(LibDir))
    7877
    79 $(warning IncDir is $(IncDir))
    80 $(warning LibDir is $(LibDir))
    81 $(warning LibName is $(LibName))
    82 $(warning Define is $(Define))
     78# Uncomment these to see just what's been ordered for the build.
     79
     80# $(warning IncDir is $(IncDir))
     81# $(warning LibDir is $(LibDir))
     82# $(warning LibName is $(LibName))
     83# $(warning Define is $(Define))
    8384
    8485##############################################################################
     
    9293
    9394TESTSRC := CbcMain.cpp
    94 #TESTSRC += CbcOrClpParam.cpp
    9595TESTSRC += CbcParam.cpp
    9696TESTSRC += unitTest.cpp
Note: See TracChangeset for help on using the changeset viewer.