Changeset 1781 for trunk/Clp/test


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

fix order of -I flags, so uninstalled headers are prefered to installed ones in case headers of dependencies are in installation directory; fix addlibs file for cl

Location:
trunk/Clp/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/test/Makefile.am

    r1655 r1781  
    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)
  • trunk/Clp/test/Makefile.in

    r1734 r1781  
    341341@COIN_HAS_OSITESTS_TRUE@  $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
    342342
    343 @COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
     343@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = \
    344344@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src` \
    345 @COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
     345@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \
     346@COIN_HAS_OSITESTS_TRUE@        $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS)
    346347
    347348@COIN_HAS_OSITESTS_TRUE@testdepend = osiUnitTest$(EXEEXT)
Note: See TracChangeset for help on using the changeset viewer.