Changeset 481


Ignore:
Timestamp:
Jan 9, 2011 11:11:40 AM (9 years ago)
Author:
stefan
Message:

add includes for cplex

Location:
branches/split/Couenne
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Couenne/Makefile.in

    r480 r481  
    857857@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    858858@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs couenne > $(addlibsdir)/couenne_addlibs.txt
    859 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs_cpp.txt
    860 @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCouenne @COUENNELIB_LIBS_INSTALLED@ > $(addlibsdir)/couenne_addlibs.txt
     859@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libBonCouenne.lib libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs_cpp.txt
     860@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lBonCouenne -lCouenne @COUENNELIB_LIBS_INSTALLED@ > $(addlibsdir)/couenne_addlibs.txt
    861861
    862862uninstall-hook:
  • branches/split/Couenne/src/heuristics/Makefile.am

    r480 r481  
    3434        -I`$(CYGPATH_W) $(srcdir)/../branch`\
    3535        -I`$(CYGPATH_W) $(srcdir)/../problem`
     36       
     37if COIN_HAS_CPX
     38AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)`
     39endif
    3640
    3741# This line is necessary to allow VPATH compilation with MS compilers
  • branches/split/Couenne/src/heuristics/Makefile.in

    r480 r481  
    4343build_triplet = @build@
    4444host_triplet = @host@
     45@COIN_HAS_CPX_TRUE@am__append_1 = -I`$(CYGPATH_W) $(CPXINCDIR)`
    4546subdir = src/heuristics
    4647DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    314315# Here list all include flags, relative to this "srcdir" directory.  This
    315316# "cygpath" stuff is necessary to compile with native compilers on Windows
    316 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
    317         -I`$(CYGPATH_W) $(srcdir)/..` \
    318         -I`$(CYGPATH_W) $(srcdir)/../convex` \
    319         -I`$(CYGPATH_W) $(srcdir)/../expression` \
    320         -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
    321         -I`$(CYGPATH_W) $(srcdir)/../expression/partial` \
    322         -I`$(CYGPATH_W) $(srcdir)/../interfaces` \
    323         -I`$(CYGPATH_W) $(srcdir)/../branch`\
    324         -I`$(CYGPATH_W) $(srcdir)/../problem`
    325 
     317AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) -I`$(CYGPATH_W) \
     318        $(srcdir)/..` -I`$(CYGPATH_W) $(srcdir)/../convex` \
     319        -I`$(CYGPATH_W) $(srcdir)/../expression` -I`$(CYGPATH_W) \
     320        $(srcdir)/../expression/operators` -I`$(CYGPATH_W) \
     321        $(srcdir)/../expression/partial` -I`$(CYGPATH_W) \
     322        $(srcdir)/../interfaces` -I`$(CYGPATH_W) $(srcdir)/../branch` \
     323        -I`$(CYGPATH_W) $(srcdir)/../problem` $(am__append_1)
    326324
    327325# This line is necessary to allow VPATH compilation with MS compilers
  • branches/split/Couenne/src/sdpcuts/Makefile.am

    r480 r481  
    4141        -I`$(CYGPATH_W) $(srcdir)/../problem`
    4242
     43if COIN_HAS_CPX
     44AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)`
     45endif
     46
    4347# This line is necessary to allow VPATH compilation with MS compilers
    4448# on Cygwin
  • branches/split/Couenne/src/sdpcuts/Makefile.in

    r480 r481  
    4343build_triplet = @build@
    4444host_triplet = @host@
     45@COIN_HAS_CPX_TRUE@am__append_1 = -I`$(CYGPATH_W) $(CPXINCDIR)`
    4546subdir = src/sdpcuts
    4647DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    323324# Here list all include flags, relative to this "srcdir" directory.  This
    324325# "cygpath" stuff is necessary to compile with native compilers on Windows
    325 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
    326         -I`$(CYGPATH_W) $(srcdir)/..` \
    327         -I`$(CYGPATH_W) $(srcdir)/../convex` \
    328         -I`$(CYGPATH_W) $(srcdir)/../problem`
    329 
     326AM_CPPFLAGS = $(COUENNELIB_CFLAGS) -I`$(CYGPATH_W) $(srcdir)/..` \
     327        -I`$(CYGPATH_W) $(srcdir)/../convex` -I`$(CYGPATH_W) \
     328        $(srcdir)/../problem` $(am__append_1)
    330329
    331330# This line is necessary to allow VPATH compilation with MS compilers
  • branches/split/Couenne/src/two_implied_bt/Makefile.in

    r480 r481  
    1515@SET_MAKE@
    1616
    17 # $Id: Makefile.am 478 2011-01-08 23:10:13Z stefan $
     17# $Id: Makefile.am 480 2011-01-09 16:05:55Z stefan $
    1818#
    1919# Copyright (C) 2006 International Business Machines and others.
Note: See TracChangeset for help on using the changeset viewer.