Ignore:
Timestamp:
Sep 13, 2010 3:41:21 AM (9 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/Makefile.am

    r1466 r1501  
    112112
    113113# Some common setup for cbc and cbc-generic.
     114#   ($(CPX_LIBS) should resolve in an empty string if there is no cplex)
    114115
    115116bin_PROGRAMS =
    116 AM_CPPFLAGS = $(COINDEPEND_CFLAGS)
     117AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_LIBS)
    117118
    118119########################################################################
     
    130131
    131132# Additional COIN libraries
    132 cbc_LDADD = libCbcSolver.la libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
     133cbc_LDADD = libCbcSolver.la libCbc.la $(CBCLIB_LIBS)
    133134
    134135# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    138139
    139140# Add locations of include files.
    140 
    141 if COIN_HAS_CLP
    142   AM_CPPFLAGS += $(CLP_CFLAGS)
    143   cbc_LDADD += $(CLP_LIBS)
    144 endif
    145 
    146 if COIN_HAS_CPX
    147   AM_CPPFLAGS += $(CPX_CFLAGS)
    148   cbc_LDADD += $(CPX_LIBS)
    149 endif
    150141
    151142if COIN_HAS_ASL
     
    181172        CbcGenSolvers.cpp
    182173
    183 cbc_generic_LDADD = libCbcSolver.la libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
     174cbc_generic_LDADD = libCbcSolver.la libCbc.la $(CBCGENERIC_LIBS)
    184175
    185176# List all additionally required solver and Osi libraries
    186 
    187 if COIN_HAS_CLP
    188   AM_CPPFLAGS += $(CLP_CFLAGS)
    189   cbc_generic_LDADD += $(CLP_LIBS)
    190 endif
    191 
    192 if COIN_HAS_CPX
    193   AM_CPPFLAGS += $(CPX_CFLAGS)
    194   cbc_generic_LDADD += $(CPX_LIBS)
    195 endif
    196 
    197 if COIN_HAS_DYLP
    198   AM_CPPFLAGS += $(DYLP_CFLAGS)
    199   cbc_generic_LDADD += $(DYLP_LIBS)
    200 endif
    201 
    202 if COIN_HAS_GLPK
    203   AM_CPPFLAGS += $(GLPK_CFLAGS)
    204   cbc_generic_LDADD += $(GLPK_LIBS)
    205 endif
    206 
    207 if COIN_HAS_MSK
    208   AM_CPPFLAGS += $(MSK_CFLAGS)
    209   cbc_generic_LDADD += $(MSK_LIBS)
    210 endif
    211 
    212 if COIN_HAS_SPX
    213   AM_CPPFLAGS += $(SPX_CFLAGS)
    214   cbc_generic_LDADD += $(SPX_LIBS)
    215 endif
    216 
    217 if COIN_HAS_VOL
    218   AM_CPPFLAGS += $(VOL_CFLAGS)
    219   cbc_generic_LDADD += $(VOL_LIBS)
    220 endif
    221 
    222 if COIN_HAS_XPR
    223   AM_CPPFLAGS += $(XPR_CFLAGS)
    224   cbc_generic_LDADD += $(XPR_LIBS)
    225 endif
     177# the linker flags for all available LP solvers should already be included in $CBCGENERIC_LIBS,
     178# so just add compiler flags here (all we can think of)
     179
     180AM_CPPFLAGS += $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(SPX_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    226181
    227182if COIN_HAS_ASL
Note: See TracChangeset for help on using the changeset viewer.