Changeset 1715 for stable/2.7/Cbc/test


Ignore:
Timestamp:
Aug 14, 2011 7:26:42 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev1714

Location:
stable/2.7
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/2.7

  • stable/2.7/Cbc

  • stable/2.7/Cbc/test/Makefile.am

    r1675 r1715  
    8181    $(CBCLIB_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
    8282
    83 AM_CPPFLAGS += $(OSITESTS_CFLAGS) \
    84         -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc`
     83AM_CPPFLAGS += -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc` $(OSITESTS_CFLAGS)
    8584
    8685ositests: osiUnitTest$(EXEEXT)
  • stable/2.7/Cbc/test/Makefile.in

    r1675 r1715  
    418418AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS) \
    419419        $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) \
    420         $(MSK_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS) $(OSITESTS_CFLAGS) \
    421         -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc`
     420        $(MSK_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS) -I`$(CYGPATH_W) \
     421        $(srcdir)/../src/OsiCbc` $(OSITESTS_CFLAGS)
    422422
    423423# This line is necessary to allow VPATH compilation
Note: See TracChangeset for help on using the changeset viewer.