Ignore:
Timestamp:
Aug 14, 2011 6:45:31 AM (9 years ago)
Author:
stefan
Message:

merge chgset 1781 from trunk

Location:
stable/1.14
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14

    • Property svn:mergeinfo changed
      /trunkmerged: 1781
  • stable/1.14/Clp/test/Makefile.am

    r1655 r1782  
    2525  $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
    2626
    27 AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
     27AM_CPPFLAGS = \
    2828        -I`$(CYGPATH_W) $(srcdir)/../src` \
    29         -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
     29        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \
     30        $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS)
    3031
    3132testdepend =  osiUnitTest$(EXEEXT)
Note: See TracChangeset for help on using the changeset viewer.