Ignore:
Timestamp:
Jun 3, 2011 10:23:39 AM (10 years ago)
Author:
stefan
Message:

add choice for more lp solvers

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SCIP/trunk/Makefile.in

    r2233 r2234  
    5454host_triplet = @host@
    5555
    56 # add SOPLEX or CLP as linear solver, if available
    57 @COIN_HAS_SOPLEX_TRUE@am__append_1 = scip/src/scip/lpi_spx.cpp
    58 @COIN_HAS_CLP_TRUE@@COIN_HAS_SOPLEX_FALSE@am__append_2 = scip/src/scip/lpi_clp.cpp
    59 @COIN_HAS_CLP_FALSE@@COIN_HAS_SOPLEX_FALSE@am__append_3 = scip/src/scip/lpi_none.cpp
     56# add LP solver interface
     57@SCIPLPI_SPX_TRUE@am__append_1 = scip/src/scip/lpi_spx.cpp
     58@SCIPLPI_CLP_TRUE@am__append_2 = scip/src/scip/lpi_clp.cpp
     59@SCIPLPI_CPX_TRUE@am__append_3 = scip/src/scip/lpi_cpx.c
     60@SCIPLPI_MSK_TRUE@am__append_4 = scip/src/scip/lpi_msk.c
     61@SCIPLPI_XPR_TRUE@am__append_5 = scip/src/scip/lpi_xprs.c
     62@SCIPLPI_GRB_TRUE@am__append_6 = scip/src/scip/lpi_grb.c
     63@SCIPLPI_QSO_TRUE@am__append_7 = scip/src/scip/lpi_qso.c
     64@SCIPLPI_NONE_TRUE@am__append_8 = scip/src/scip/lpi_none.c
    6065
    6166# add IPOPT as nonlinear solver, if available
    62 @COIN_HAS_IPOPT_TRUE@am__append_4 = scip/src/nlpi/nlpi_ipopt.cpp
    63 @COIN_HAS_IPOPT_FALSE@am__append_5 = scip/src/nlpi/nlpi_ipopt_dummy.c
     67@COIN_HAS_IPOPT_TRUE@am__append_9 = scip/src/nlpi/nlpi_ipopt.cpp
     68@COIN_HAS_IPOPT_FALSE@am__append_10 = scip/src/nlpi/nlpi_ipopt_dummy.c
    6469
    6570# use CppAD for expression evaluation, if available
    66 @COIN_HAS_CPPAD_TRUE@am__append_6 = scip/src/nlpi/exprinterpret_cppad.cpp
    67 @COIN_HAS_CPPAD_FALSE@am__append_7 = scip/src/nlpi/exprinterpret_none.c
     71@COIN_HAS_CPPAD_TRUE@am__append_11 = scip/src/nlpi/exprinterpret_cppad.cpp
     72@COIN_HAS_CPPAD_FALSE@am__append_12 = scip/src/nlpi/exprinterpret_none.c
    6873DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
    6974        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
     
    7479        compile config.guess config.sub depcomp install-sh ltmain.sh \
    7580        missing
    76 @HAVE_EXTERNALS_TRUE@am__append_8 = Dependencies
    77 @HAVE_EXTERNALS_TRUE@am__append_9 = .Dependencies-stamp
     81@HAVE_EXTERNALS_TRUE@am__append_13 = Dependencies
     82@HAVE_EXTERNALS_TRUE@am__append_14 = .Dependencies-stamp
    7883subdir = .
    7984ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    197202        scip/src/dijkstra/dijkstra_bh.c scip/src/xml/xmlparse.c \
    198203        scip/src/scip/lpi_spx.cpp scip/src/scip/lpi_clp.cpp \
    199         scip/src/scip/lpi_none.cpp scip/src/nlpi/nlpi_ipopt.cpp \
    200         scip/src/nlpi/nlpi_ipopt_dummy.c \
     204        scip/src/scip/lpi_cpx.c scip/src/scip/lpi_msk.c \
     205        scip/src/scip/lpi_xprs.c scip/src/scip/lpi_grb.c \
     206        scip/src/scip/lpi_qso.c scip/src/scip/lpi_none.c \
     207        scip/src/nlpi/nlpi_ipopt.cpp scip/src/nlpi/nlpi_ipopt_dummy.c \
    201208        scip/src/nlpi/exprinterpret_cppad.cpp \
    202209        scip/src/nlpi/exprinterpret_none.c
    203210am__dirstamp = $(am__leading_dot)dirstamp
    204 @COIN_HAS_SOPLEX_TRUE@am__objects_1 = scip/src/scip/lpi_spx.lo
    205 @COIN_HAS_CLP_TRUE@@COIN_HAS_SOPLEX_FALSE@am__objects_2 = scip/src/scip/lpi_clp.lo
    206 @COIN_HAS_CLP_FALSE@@COIN_HAS_SOPLEX_FALSE@am__objects_3 = scip/src/scip/lpi_none.lo
    207 @COIN_HAS_IPOPT_TRUE@am__objects_4 = scip/src/nlpi/nlpi_ipopt.lo
    208 @COIN_HAS_IPOPT_FALSE@am__objects_5 =  \
     211@SCIPLPI_SPX_TRUE@am__objects_1 = scip/src/scip/lpi_spx.lo
     212@SCIPLPI_CLP_TRUE@am__objects_2 = scip/src/scip/lpi_clp.lo
     213@SCIPLPI_CPX_TRUE@am__objects_3 = scip/src/scip/lpi_cpx.lo
     214@SCIPLPI_MSK_TRUE@am__objects_4 = scip/src/scip/lpi_msk.lo
     215@SCIPLPI_XPR_TRUE@am__objects_5 = scip/src/scip/lpi_xprs.lo
     216@SCIPLPI_GRB_TRUE@am__objects_6 = scip/src/scip/lpi_grb.lo
     217@SCIPLPI_QSO_TRUE@am__objects_7 = scip/src/scip/lpi_qso.lo
     218@SCIPLPI_NONE_TRUE@am__objects_8 = scip/src/scip/lpi_none.lo
     219@COIN_HAS_IPOPT_TRUE@am__objects_9 = scip/src/nlpi/nlpi_ipopt.lo
     220@COIN_HAS_IPOPT_FALSE@am__objects_10 =  \
    209221@COIN_HAS_IPOPT_FALSE@  scip/src/nlpi/nlpi_ipopt_dummy.lo
    210 @COIN_HAS_CPPAD_TRUE@am__objects_6 =  \
     222@COIN_HAS_CPPAD_TRUE@am__objects_11 =  \
    211223@COIN_HAS_CPPAD_TRUE@   scip/src/nlpi/exprinterpret_cppad.lo
    212 @COIN_HAS_CPPAD_FALSE@am__objects_7 =  \
     224@COIN_HAS_CPPAD_FALSE@am__objects_12 =  \
    213225@COIN_HAS_CPPAD_FALSE@  scip/src/nlpi/exprinterpret_none.lo
    214226am_libcoinscip_la_OBJECTS = scip/src/scip/branch.lo \
     
    316328        $(am__objects_1) $(am__objects_2) $(am__objects_3) \
    317329        $(am__objects_4) $(am__objects_5) $(am__objects_6) \
    318         $(am__objects_7)
     330        $(am__objects_7) $(am__objects_8) $(am__objects_9) \
     331        $(am__objects_10) $(am__objects_11) $(am__objects_12)
    319332libcoinscip_la_OBJECTS = $(am_libcoinscip_la_OBJECTS)
    320333depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    394407COIN_HAS_CPPAD_FALSE = @COIN_HAS_CPPAD_FALSE@
    395408COIN_HAS_CPPAD_TRUE = @COIN_HAS_CPPAD_TRUE@
     409COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
     410COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     411COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
     412COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
    396413COIN_HAS_IPOPT_FALSE = @COIN_HAS_IPOPT_FALSE@
    397414COIN_HAS_IPOPT_TRUE = @COIN_HAS_IPOPT_TRUE@
     415COIN_HAS_MSK_FALSE = @COIN_HAS_MSK_FALSE@
     416COIN_HAS_MSK_TRUE = @COIN_HAS_MSK_TRUE@
    398417COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
    399418COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     419COIN_HAS_QSO_FALSE = @COIN_HAS_QSO_FALSE@
     420COIN_HAS_QSO_TRUE = @COIN_HAS_QSO_TRUE@
    400421COIN_HAS_SOPLEX_FALSE = @COIN_HAS_SOPLEX_FALSE@
    401422COIN_HAS_SOPLEX_TRUE = @COIN_HAS_SOPLEX_TRUE@
     423COIN_HAS_XPR_FALSE = @COIN_HAS_XPR_FALSE@
     424COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
    402425COIN_HAS_ZLIB_FALSE = @COIN_HAS_ZLIB_FALSE@
    403426COIN_HAS_ZLIB_TRUE = @COIN_HAS_ZLIB_TRUE@
     
    413436CPPAD_LIBS_INSTALLED = @CPPAD_LIBS_INSTALLED@
    414437CPPFLAGS = @CPPFLAGS@
     438CPXINCDIR = @CPXINCDIR@
     439CPXLIB = @CPXLIB@
    415440CXX = @CXX@
    416441CXXCPP = @CXXCPP@
     
    431456F77 = @F77@
    432457FFLAGS = @FFLAGS@
     458GRBINCDIR = @GRBINCDIR@
     459GRBLIB = @GRBLIB@
    433460HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    434461HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    459486MPICC = @MPICC@
    460487MPICXX = @MPICXX@
     488MSKINCDIR = @MSKINCDIR@
     489MSKLIB = @MSKLIB@
    461490OBJEXT = @OBJEXT@
    462491OPT_CFLAGS = @OPT_CFLAGS@
     
    470499PATH_SEPARATOR = @PATH_SEPARATOR@
    471500PKG_CONFIG = @PKG_CONFIG@
     501QSOINCDIR = @QSOINCDIR@
     502QSOLIB = @QSOLIB@
    472503RANLIB = @RANLIB@
    473504RPATH_FLAGS = @RPATH_FLAGS@
     
    479510SCIPLIB_PCLIBS = @SCIPLIB_PCLIBS@
    480511SCIPLIB_PCREQUIRES = @SCIPLIB_PCREQUIRES@
     512SCIPLPI_CLP_FALSE = @SCIPLPI_CLP_FALSE@
     513SCIPLPI_CLP_TRUE = @SCIPLPI_CLP_TRUE@
     514SCIPLPI_CPX_FALSE = @SCIPLPI_CPX_FALSE@
     515SCIPLPI_CPX_TRUE = @SCIPLPI_CPX_TRUE@
     516SCIPLPI_GRB_FALSE = @SCIPLPI_GRB_FALSE@
     517SCIPLPI_GRB_TRUE = @SCIPLPI_GRB_TRUE@
     518SCIPLPI_MSK_FALSE = @SCIPLPI_MSK_FALSE@
     519SCIPLPI_MSK_TRUE = @SCIPLPI_MSK_TRUE@
     520SCIPLPI_NONE_FALSE = @SCIPLPI_NONE_FALSE@
     521SCIPLPI_NONE_TRUE = @SCIPLPI_NONE_TRUE@
     522SCIPLPI_QSO_FALSE = @SCIPLPI_QSO_FALSE@
     523SCIPLPI_QSO_TRUE = @SCIPLPI_QSO_TRUE@
     524SCIPLPI_SPX_FALSE = @SCIPLPI_SPX_FALSE@
     525SCIPLPI_SPX_TRUE = @SCIPLPI_SPX_TRUE@
     526SCIPLPI_XPR_FALSE = @SCIPLPI_XPR_FALSE@
     527SCIPLPI_XPR_TRUE = @SCIPLPI_XPR_TRUE@
    481528SCIP_SVN_REV = @SCIP_SVN_REV@
    482529SET_MAKE = @SET_MAKE@
     
    492539VERSION = @VERSION@
    493540VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
     541XPRINCDIR = @XPRINCDIR@
     542XPRLIB = @XPRLIB@
    494543abs_bin_dir = @abs_bin_dir@
    495544abs_include_dir = @abs_include_dir@
     
    548597target_alias = @target_alias@
    549598AUTOMAKE_OPTIONS = foreign
    550 EXTRA_DIST = $(am__append_8)
     599EXTRA_DIST = $(am__append_13)
    551600lib_LTLIBRARIES = libcoinscip.la
    552601libcoinscip_la_SOURCES = scip/src/scip/branch.c \
     
    648697        $(am__append_1) $(am__append_2) $(am__append_3) \
    649698        $(am__append_4) $(am__append_5) $(am__append_6) \
    650         $(am__append_7)
     699        $(am__append_7) $(am__append_8) $(am__append_9) \
     700        $(am__append_10) $(am__append_11) $(am__append_12)
    651701AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/scip/src` $(SCIPLIB_CFLAGS)
    652702DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
     
    893943
    894944# Files that are generated and should be cleaned with make distclean
    895 DISTCLEANFILES = $(am__append_9) $(VPATH_DISTCLEANFILES)
     945DISTCLEANFILES = $(am__append_14) $(VPATH_DISTCLEANFILES)
    896946DocFiles = README AUTHORS LICENSE
    897947DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     
    13481398        scip/src/scip/$(DEPDIR)/$(am__dirstamp)
    13491399scip/src/scip/lpi_clp.lo: scip/src/scip/$(am__dirstamp) \
     1400        scip/src/scip/$(DEPDIR)/$(am__dirstamp)
     1401scip/src/scip/lpi_cpx.lo: scip/src/scip/$(am__dirstamp) \
     1402        scip/src/scip/$(DEPDIR)/$(am__dirstamp)
     1403scip/src/scip/lpi_msk.lo: scip/src/scip/$(am__dirstamp) \
     1404        scip/src/scip/$(DEPDIR)/$(am__dirstamp)
     1405scip/src/scip/lpi_xprs.lo: scip/src/scip/$(am__dirstamp) \
     1406        scip/src/scip/$(DEPDIR)/$(am__dirstamp)
     1407scip/src/scip/lpi_grb.lo: scip/src/scip/$(am__dirstamp) \
     1408        scip/src/scip/$(DEPDIR)/$(am__dirstamp)
     1409scip/src/scip/lpi_qso.lo: scip/src/scip/$(am__dirstamp) \
    13501410        scip/src/scip/$(DEPDIR)/$(am__dirstamp)
    13511411scip/src/scip/lpi_none.lo: scip/src/scip/$(am__dirstamp) \
     
    15521612        -rm -f scip/src/scip/lpi_clp.$(OBJEXT)
    15531613        -rm -f scip/src/scip/lpi_clp.lo
     1614        -rm -f scip/src/scip/lpi_cpx.$(OBJEXT)
     1615        -rm -f scip/src/scip/lpi_cpx.lo
     1616        -rm -f scip/src/scip/lpi_grb.$(OBJEXT)
     1617        -rm -f scip/src/scip/lpi_grb.lo
     1618        -rm -f scip/src/scip/lpi_msk.$(OBJEXT)
     1619        -rm -f scip/src/scip/lpi_msk.lo
    15541620        -rm -f scip/src/scip/lpi_none.$(OBJEXT)
    15551621        -rm -f scip/src/scip/lpi_none.lo
     1622        -rm -f scip/src/scip/lpi_qso.$(OBJEXT)
     1623        -rm -f scip/src/scip/lpi_qso.lo
    15561624        -rm -f scip/src/scip/lpi_spx.$(OBJEXT)
    15571625        -rm -f scip/src/scip/lpi_spx.lo
     1626        -rm -f scip/src/scip/lpi_xprs.$(OBJEXT)
     1627        -rm -f scip/src/scip/lpi_xprs.lo
    15581628        -rm -f scip/src/scip/mem.$(OBJEXT)
    15591629        -rm -f scip/src/scip/mem.lo
     
    18001870@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/lp.Plo@am__quote@
    18011871@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/lpi_clp.Plo@am__quote@
     1872@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/lpi_cpx.Plo@am__quote@
     1873@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/lpi_grb.Plo@am__quote@
     1874@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/lpi_msk.Plo@am__quote@
    18021875@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/lpi_none.Plo@am__quote@
     1876@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/lpi_qso.Plo@am__quote@
    18031877@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/lpi_spx.Plo@am__quote@
     1878@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/lpi_xprs.Plo@am__quote@
    18041879@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/mem.Plo@am__quote@
    18051880@AMDEP_TRUE@@am__include@ @am__quote@scip/src/scip/$(DEPDIR)/message.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.