Changeset 1660 for trunk/Cbc/test


Ignore:
Timestamp:
Jun 9, 2011 9:09:23 AM (8 years ago)
Author:
stefan
Message:

change to new way of using and installing configuration header files

Location:
trunk/Cbc/test
Files:
2 edited

Legend:

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

    r1611 r1660  
    6767AM_CPPFLAGS += $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    6868
     69# This line is necessary to allow VPATH compilation
     70DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
     71
    6972########################################################################
    7073#                         unitTest for OsiCbc                          #
  • trunk/Cbc/test/Makefile.in

    r1646 r1660  
    5858        $(ACLOCAL_M4)
    5959mkinstalldirs = $(install_sh) -d
    60 CONFIG_HEADER = $(top_builddir)/inc/config_cbc.h
     60CONFIG_HEADER = $(top_builddir)/src/config.h \
     61        $(top_builddir)/src/config_cbc.h
    6162CONFIG_CLEAN_FILES =
    6263am__installdirs = "$(DESTDIR)$(bindir)"
     
    6970        OsiCbcSolverInterfaceTest.$(OBJEXT)
    7071osiUnitTest_OBJECTS = $(am_osiUnitTest_OBJECTS)
    71 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    7272depcomp = $(SHELL) $(top_srcdir)/depcomp
    7373am__depfiles_maybe = depfiles
     
    424424        -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc`
    425425
     426# This line is necessary to allow VPATH compilation
     427DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
     428
    426429########################################################################
    427430#                         unitTest for OsiCbc                          #
Note: See TracChangeset for help on using the changeset viewer.