Ignore:
Timestamp:
Jul 26, 2007 8:40:42 PM (12 years ago)
Author:
lou
Message:

Support for ThirdParty/Glpk?. Correct detection of SYMPHONY, should it ever be
pulled in as an external.

File:
1 edited

Legend:

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

    r687 r710  
    198198endif
    199199
    200 if COIN_HAS_SYM
    201   AM_CPPFLAGS += -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
     200if COIN_HAS_SYMPHONY
     201  AM_CPPFLAGS += -I`$(CYGPATH_W) $(SYMPHONYSRCDIR)/src` \
    202202        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    203203  cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    204         $(SYMOBJDIR)/src/libSym.la
    205   LIBS += `cat $(SYMOBJDIR)/sym_addlibs.txt`
     204        $(SYMPHONYOBJDIR)/src/libSym.la
     205  LIBS += `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
    206206endif
    207207
Note: See TracChangeset for help on using the changeset viewer.