Ignore:
Timestamp:
Apr 18, 2013 9:39:00 AM (7 years ago)
Author:
forrest
Message:

allow AMPL in Clp

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        11BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
        23ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.3
        34ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.4
         
        910CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        1011Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
        11 
  • trunk/Clp/src/Makefile.in

    r1910 r1946  
    256256PROGRAMS = $(bin_PROGRAMS)
    257257am_clp_OBJECTS = ClpMain.$(OBJEXT) CbcOrClpParam.$(OBJEXT) \
    258         MyEventHandler.$(OBJEXT) MyMessageHandler.$(OBJEXT) \
    259         unitTest.$(OBJEXT)
     258        Clp_ampl.$(OBJEXT) MyEventHandler.$(OBJEXT) \
     259        MyMessageHandler.$(OBJEXT) unitTest.$(OBJEXT)
    260260clp_OBJECTS = $(am_clp_OBJECTS)
    261261am__DEPENDENCIES_1 =
     
    324324AMTAR = @AMTAR@
    325325AR = @AR@
     326ASL_CFLAGS = @ASL_CFLAGS@
     327ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
     328ASL_DATA = @ASL_DATA@
     329ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
     330ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
     331ASL_LIBS = @ASL_LIBS@
     332ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
    326333AUTOCONF = @AUTOCONF@
    327334AUTOHEADER = @AUTOHEADER@
     
    366373COIN_HAS_AMD_FALSE = @COIN_HAS_AMD_FALSE@
    367374COIN_HAS_AMD_TRUE = @COIN_HAS_AMD_TRUE@
     375COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
     376COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
    368377COIN_HAS_BLAS_FALSE = @COIN_HAS_BLAS_FALSE@
    369378COIN_HAS_BLAS_TRUE = @COIN_HAS_BLAS_TRUE@
     
    619628        ClpMain.cpp \
    620629        CbcOrClpParam.cpp CbcOrClpParam.hpp \
     630        Clp_ampl.cpp Clp_ampl.h \
    621631        MyEventHandler.cpp MyEventHandler.hpp \
    622632        MyMessageHandler.cpp MyMessageHandler.hpp \
     
    625635
    626636# List all additionally required libraries
    627 clp_LDADD = libClp.la $(CLPLIB_LIBS)
     637clp_LDADD = libClp.la $(CLPLIB_LIBS) $(ASL_LIBS)
    628638
    629639# List all dependency libraries (similar to LDADD, but without -l, -L flags)
     
    861871@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpSolve.Plo@am__quote@
    862872@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Clp_C_Interface.Plo@am__quote@
     873@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Clp_ampl.Po@am__quote@
    863874@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinAbcBaseFactorization1.Plo@am__quote@
    864875@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinAbcBaseFactorization2.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.