Changeset 1714 for trunk/Cbc/src


Ignore:
Timestamp:
Aug 14, 2011 7:19:35 AM (8 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/Cbc/src
Files:
3 edited

Legend:

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

    r1668 r1714  
    12661266
    12671267
     1268#######################################################################
     1269# Create the Config.h file that has all public defines and install it #
     1270#######################################################################
     1271
    12681272install-exec-local:
    12691273        $(install_sh_DATA) config_cbc.h $(DESTDIR)$(includecoindir)/CbcConfig.h
  • trunk/Cbc/src/OsiCbc/Makefile.am

    r1660 r1714  
    2424# Here list all include flags, relative to this "srcdir" directory.  This
    2525# "cygpath" stuff is necessary to compile with native compilers on Windows.
    26 # "top_srcdir" refers to the basic directory for the main package that is
    27 # being compiled.
    28 
    29 # Needed by any OsiCbc configuration.
    30 
    31 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) \
    32         -I`$(CYGPATH_W) $(srcdir)/..`
     26AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINDEPEND_CFLAGS)
    3327
    3428# Plus the appropriate include directories for the default solver.
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1668 r1714  
    440440# Here list all include flags, relative to this "srcdir" directory.  This
    441441# "cygpath" stuff is necessary to compile with native compilers on Windows.
    442 # "top_srcdir" refers to the basic directory for the main package that is
    443 # being compiled.
    444 
    445 # Needed by any OsiCbc configuration.
    446 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) -I`$(CYGPATH_W) $(srcdir)/..` \
     442AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINDEPEND_CFLAGS) \
    447443        $(am__append_1) $(am__append_2) $(am__append_3) \
    448444        $(am__append_4) $(am__append_5) $(am__append_6) \
Note: See TracChangeset for help on using the changeset viewer.