Changeset 2701 for ThirdParty/SCIP


Ignore:
Timestamp:
Feb 6, 2013 2:15:01 PM (7 years ago)
Author:
stefan
Message:

move LPIs and related into separate library

Location:
ThirdParty/SCIP/trunk
Files:
4 edited

Legend:

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

    r2690 r2701  
    99EXTRA_DIST =
    1010
    11 lib_LTLIBRARIES = libcoinscip.la
     11lib_LTLIBRARIES = libcoinscip.la libcoinsciplpis.la
    1212
    1313AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/scip/src` $(SCIPLIB_CFLAGS)
     
    1616
    1717libcoinscip_la_LDFLAGS = $(LT_LDFLAGS)
     18libcoinsciplpis_la_LDFLAGS = $(LT_LDFLAGS)
    1819
    1920libcoinscip_la_SOURCES = \
     
    198199  scip/src/xml/xmlparse.c
    199200
    200 # add LP solver interfaces
    201 libcoinscip_la_SOURCES += lpiswitch.c lpiswitch_init.cpp lpiswitch_none.c
     201# LP solver interfaces
     202libcoinsciplpis_la_SOURCES = lpiswitch.c lpiswitch_init.cpp lpiswitch_none.c
    202203if COIN_HAS_SOPLEX
    203   libcoinscip_la_SOURCES += lpiswitch_spx.cpp
     204  libcoinsciplpis_la_SOURCES += lpiswitch_spx.cpp
    204205endif 
    205206if COIN_HAS_CLP
    206   libcoinscip_la_SOURCES += lpiswitch_clp.cpp
     207  libcoinsciplpis_la_SOURCES += lpiswitch_clp.cpp
    207208endif
    208209if COIN_HAS_CPX
    209   libcoinscip_la_SOURCES += lpiswitch_cpx.c
     210  libcoinsciplpis_la_SOURCES += lpiswitch_cpx.c
    210211  AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)`
    211212endif
    212213if COIN_HAS_MSK
    213   libcoinscip_la_SOURCES += lpiswitch_msk.c
     214  libcoinsciplpis_la_SOURCES += lpiswitch_msk.c
    214215  AM_CPPFLAGS += -I`$(CYGPATH_W) $(MSKINCDIR)`
    215216endif
    216217if COIN_HAS_XPR
    217   libcoinscip_la_SOURCES += lpiswitch_xprs.c
     218  libcoinsciplpis_la_SOURCES += lpiswitch_xprs.c
    218219  AM_CPPFLAGS += -I`$(CYGPATH_W) $(XPRINCDIR)`
    219220endif
    220221if COIN_HAS_GRB
    221   libcoinscip_la_SOURCES += lpiswitch_grb.c
     222  libcoinsciplpis_la_SOURCES += lpiswitch_grb.c
    222223  AM_CPPFLAGS += -I`$(CYGPATH_W) $(GRBINCDIR)`
    223224endif
    224225if COIN_HAS_QSO
    225   libcoinscip_la_SOURCES += lpiswitch_qso.c
     226  libcoinsciplpis_la_SOURCES += lpiswitch_qso.c
    226227  AM_CPPFLAGS += -I`$(CYGPATH_W) $(QSOINCDIR)`
    227228endif
  • ThirdParty/SCIP/trunk/Makefile.in

    r2690 r2701  
    210210        scip/src/nlpi/exprinterpret_cppad.cpp \
    211211        scip/src/dijkstra/dijkstra.c scip/src/xml/xmlparse.c \
    212         lpiswitch.c lpiswitch_init.cpp lpiswitch_none.c \
    213         lpiswitch_spx.cpp lpiswitch_clp.cpp lpiswitch_cpx.c \
    214         lpiswitch_msk.c lpiswitch_xprs.c lpiswitch_grb.c \
    215         lpiswitch_qso.c scip/src/nlpi/nlpi_ipopt.cpp \
    216         scip/src/nlpi/nlpi_ipopt_dummy.c
    217 @COIN_HAS_SOPLEX_TRUE@am__objects_1 = lpiswitch_spx.lo
    218 @COIN_HAS_CLP_TRUE@am__objects_2 = lpiswitch_clp.lo
    219 @COIN_HAS_CPX_TRUE@am__objects_3 = lpiswitch_cpx.lo
    220 @COIN_HAS_MSK_TRUE@am__objects_4 = lpiswitch_msk.lo
    221 @COIN_HAS_XPR_TRUE@am__objects_5 = lpiswitch_xprs.lo
    222 @COIN_HAS_GRB_TRUE@am__objects_6 = lpiswitch_grb.lo
    223 @COIN_HAS_QSO_TRUE@am__objects_7 = lpiswitch_qso.lo
    224 @COIN_HAS_IPOPT_TRUE@am__objects_8 = nlpi_ipopt.lo
    225 @COIN_HAS_IPOPT_FALSE@am__objects_9 = nlpi_ipopt_dummy.lo
     212        scip/src/nlpi/nlpi_ipopt.cpp scip/src/nlpi/nlpi_ipopt_dummy.c
     213@COIN_HAS_IPOPT_TRUE@am__objects_1 = nlpi_ipopt.lo
     214@COIN_HAS_IPOPT_FALSE@am__objects_2 = nlpi_ipopt_dummy.lo
    226215am_libcoinscip_la_OBJECTS = bitencode.lo branch.lo buffer.lo clock.lo \
    227216        conflict.lo cons.lo cutpool.lo debug.lo dialog.lo disp.lo \
     
    275264        tclique_coloring.lo tclique_graph.lo memory.lo expr.lo nlpi.lo \
    276265        nlpioracle.lo exprinterpret_cppad.lo dijkstra.lo xmlparse.lo \
    277         lpiswitch.lo lpiswitch_init.lo lpiswitch_none.lo \
    278         $(am__objects_1) $(am__objects_2) $(am__objects_3) \
    279         $(am__objects_4) $(am__objects_5) $(am__objects_6) \
    280         $(am__objects_7) $(am__objects_8) $(am__objects_9)
     266        $(am__objects_1) $(am__objects_2)
    281267libcoinscip_la_OBJECTS = $(am_libcoinscip_la_OBJECTS)
     268libcoinsciplpis_la_LIBADD =
     269am__libcoinsciplpis_la_SOURCES_DIST = lpiswitch.c lpiswitch_init.cpp \
     270        lpiswitch_none.c lpiswitch_spx.cpp lpiswitch_clp.cpp \
     271        lpiswitch_cpx.c lpiswitch_msk.c lpiswitch_xprs.c \
     272        lpiswitch_grb.c lpiswitch_qso.c
     273@COIN_HAS_SOPLEX_TRUE@am__objects_3 = lpiswitch_spx.lo
     274@COIN_HAS_CLP_TRUE@am__objects_4 = lpiswitch_clp.lo
     275@COIN_HAS_CPX_TRUE@am__objects_5 = lpiswitch_cpx.lo
     276@COIN_HAS_MSK_TRUE@am__objects_6 = lpiswitch_msk.lo
     277@COIN_HAS_XPR_TRUE@am__objects_7 = lpiswitch_xprs.lo
     278@COIN_HAS_GRB_TRUE@am__objects_8 = lpiswitch_grb.lo
     279@COIN_HAS_QSO_TRUE@am__objects_9 = lpiswitch_qso.lo
     280am_libcoinsciplpis_la_OBJECTS = lpiswitch.lo lpiswitch_init.lo \
     281        lpiswitch_none.lo $(am__objects_3) $(am__objects_4) \
     282        $(am__objects_5) $(am__objects_6) $(am__objects_7) \
     283        $(am__objects_8) $(am__objects_9)
     284libcoinsciplpis_la_OBJECTS = $(am_libcoinsciplpis_la_OBJECTS)
    282285depcomp = $(SHELL) $(top_srcdir)/depcomp
    283286am__depfiles_maybe = depfiles
     
    298301CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
    299302        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    300 SOURCES = $(libcoinscip_la_SOURCES)
    301 DIST_SOURCES = $(am__libcoinscip_la_SOURCES_DIST)
     303SOURCES = $(libcoinscip_la_SOURCES) $(libcoinsciplpis_la_SOURCES)
     304DIST_SOURCES = $(am__libcoinscip_la_SOURCES_DIST) \
     305        $(am__libcoinsciplpis_la_SOURCES_DIST)
    302306pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    303307DATA = $(pkgconfiglib_DATA)
     
    523527AUTOMAKE_OPTIONS = foreign
    524528EXTRA_DIST = $(am__append_15)
    525 lib_LTLIBRARIES = libcoinscip.la
     529lib_LTLIBRARIES = libcoinscip.la libcoinsciplpis.la
    526530AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/scip/src` $(SCIPLIB_CFLAGS) \
    527531        $(am__append_4) $(am__append_6) $(am__append_8) \
     
    529533DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    530534libcoinscip_la_LDFLAGS = $(LT_LDFLAGS)
    531 
    532 # add LP solver interfaces
     535libcoinsciplpis_la_LDFLAGS = $(LT_LDFLAGS)
    533536libcoinscip_la_SOURCES = scip/src/scip/bitencode.c \
    534537        scip/src/scip/branch.c scip/src/scip/buffer.c \
     
    637640        scip/src/nlpi/exprinterpret_cppad.cpp \
    638641        scip/src/dijkstra/dijkstra.c scip/src/xml/xmlparse.c \
    639         lpiswitch.c lpiswitch_init.cpp lpiswitch_none.c \
    640         $(am__append_1) $(am__append_2) $(am__append_3) \
    641         $(am__append_5) $(am__append_7) $(am__append_9) \
    642         $(am__append_11) $(am__append_13) $(am__append_14)
     642        $(am__append_13) $(am__append_14)
     643
     644# LP solver interfaces
     645libcoinsciplpis_la_SOURCES = lpiswitch.c lpiswitch_init.cpp \
     646        lpiswitch_none.c $(am__append_1) $(am__append_2) \
     647        $(am__append_3) $(am__append_5) $(am__append_7) \
     648        $(am__append_9) $(am__append_11)
    643649thirdpartyincludedir = $(includedir)/coin/ThirdParty
    644650thirdpartyinclude_HEADERS = lpiswitch.h
     
    10001006libcoinscip.la: $(libcoinscip_la_OBJECTS) $(libcoinscip_la_DEPENDENCIES)
    10011007        $(CXXLINK) -rpath $(libdir) $(libcoinscip_la_LDFLAGS) $(libcoinscip_la_OBJECTS) $(libcoinscip_la_LIBADD) $(LIBS)
     1008libcoinsciplpis.la: $(libcoinsciplpis_la_OBJECTS) $(libcoinsciplpis_la_DEPENDENCIES)
     1009        $(CXXLINK) -rpath $(libdir) $(libcoinsciplpis_la_LDFLAGS) $(libcoinsciplpis_la_OBJECTS) $(libcoinsciplpis_la_LIBADD) $(LIBS)
    10021010
    10031011mostlyclean-compile:
  • ThirdParty/SCIP/trunk/coinscip-uninstalled.pc.in

    r2690 r2701  
    66URL: https://projects.coin-or.org/BuildTools
    77Version: @PACKAGE_VERSION@
    8 Libs: ${libdir}/libcoinscip.la @SCIPLIB_PCLIBS@
     8Libs: ${libdir}/libcoinsciplpis.la ${libdir}/libcoinscip.la @SCIPLIB_PCLIBS@
    99Cflags: -I@abs_source_dir@ -I@abs_source_dir@/scip/src
    1010Requires: @SCIPLIB_PCREQUIRES@
  • ThirdParty/SCIP/trunk/coinscip.pc.in

    r2229 r2701  
    88URL: https://projects.coin-or.org/BuildTools
    99Version: @PACKAGE_VERSION@
    10 Libs: -L${libdir} -lcoinscip @SCIPLIB_PCLIBS@
     10Libs: -L${libdir} -lcoinsciplpis -lcoinscip @SCIPLIB_PCLIBS@
    1111Cflags: -I${includedir}
    1212Requires: @SCIPLIB_PCREQUIRES@
Note: See TracChangeset for help on using the changeset viewer.