Changeset 3262


Ignore:
Timestamp:
Nov 11, 2014 5:44:06 AM (6 years ago)
Author:
stefan
Message:

add support for upcoming soplex bugfix release

Location:
ThirdParty/SoPlex/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/SoPlex/trunk/Makefile.am

    r3224 r3262  
    6464  soplex/src/spxwritestate.cpp \
    6565  soplex/src/statistics.cpp \
    66   soplex/src/timer.cpp \
    6766  soplex/src/unitvector.cpp \
    6867  soplex/src/updatevector.cpp
     68
     69if TIMER_IS_USERTIMER
     70libcoinsoplex_la_SOURCES += soplex/src/usertimer.cpp soplex/src/wallclocktimer.cpp
     71else
     72libcoinsoplex_la_SOURCES += soplex/src/timer.cpp
     73endif
    6974
    7075AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/soplex/src`

  • ThirdParty/SoPlex/trunk/Makefile.in

    r3224 r3262  
    5353build_triplet = @build@
    5454host_triplet = @host@
     55@TIMER_IS_USERTIMER_TRUE@am__append_1 = soplex/src/usertimer.cpp soplex/src/wallclocktimer.cpp
     56@TIMER_IS_USERTIMER_FALSE@am__append_2 = soplex/src/timer.cpp
    5557DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
    5658        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    … …  
    5961        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure \
    6062        config.guess config.sub depcomp install-sh ltmain.sh missing
    61 @HAVE_EXTERNALS_TRUE@am__append_1 = Dependencies
    62 @HAVE_EXTERNALS_TRUE@am__append_2 = .Dependencies-stamp
     63@HAVE_EXTERNALS_TRUE@am__append_3 = Dependencies
     64@HAVE_EXTERNALS_TRUE@am__append_4 = .Dependencies-stamp
    6365subdir = .
    6466ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    8385LTLIBRARIES = $(lib_LTLIBRARIES)
    8486libcoinsoplex_la_LIBADD =
     87am__libcoinsoplex_la_SOURCES_DIST = soplex/src/changesoplex.cpp \
     88        soplex/src/clufactor.cpp soplex/src/didxset.cpp \
     89        soplex/src/enter.cpp soplex/src/gzstream.cpp \
     90        soplex/src/idxset.cpp soplex/src/leave.cpp \
     91        soplex/src/mpsinput.cpp soplex/src/nameset.cpp \
     92        soplex/src/rational.cpp soplex/src/slufactor.cpp \
     93        soplex/src/solverational.cpp soplex/src/solvereal.cpp \
     94        soplex/src/soplex.cpp soplex/src/soplexlegacy.cpp \
     95        soplex/src/spxautopr.cpp soplex/src/spxbasis.cpp \
     96        soplex/src/spxboundflippingrt.cpp soplex/src/spxbounds.cpp \
     97        soplex/src/spxchangebasis.cpp soplex/src/spxdantzigpr.cpp \
     98        soplex/src/spxdefaultrt.cpp soplex/src/spxdefines.cpp \
     99        soplex/src/spxdesc.cpp soplex/src/spxdevexpr.cpp \
     100        soplex/src/spxequilisc.cpp soplex/src/spxfastrt.cpp \
     101        soplex/src/spxfileio.cpp soplex/src/spxgeometsc.cpp \
     102        soplex/src/spxgithash.cpp soplex/src/spxharrisrt.cpp \
     103        soplex/src/spxhybridpr.cpp soplex/src/spxid.cpp \
     104        soplex/src/spxlpbase_rational.cpp \
     105        soplex/src/spxlpbase_real.cpp soplex/src/spxmainsm.cpp \
     106        soplex/src/spxout.cpp soplex/src/spxparmultpr.cpp \
     107        soplex/src/spxquality.cpp soplex/src/spxscaler.cpp \
     108        soplex/src/spxshift.cpp soplex/src/spxsolver.cpp \
     109        soplex/src/spxsolve.cpp soplex/src/spxstarter.cpp \
     110        soplex/src/spxsteeppr.cpp soplex/src/spxsumst.cpp \
     111        soplex/src/spxvecs.cpp soplex/src/spxvectorst.cpp \
     112        soplex/src/spxweightpr.cpp soplex/src/spxweightst.cpp \
     113        soplex/src/spxwritestate.cpp soplex/src/statistics.cpp \
     114        soplex/src/unitvector.cpp soplex/src/updatevector.cpp \
     115        soplex/src/usertimer.cpp soplex/src/wallclocktimer.cpp \
     116        soplex/src/timer.cpp
     117@TIMER_IS_USERTIMER_TRUE@am__objects_1 = usertimer.lo \
     118@TIMER_IS_USERTIMER_TRUE@       wallclocktimer.lo
     119@TIMER_IS_USERTIMER_FALSE@am__objects_2 = timer.lo
    85120am_libcoinsoplex_la_OBJECTS = changesoplex.lo clufactor.lo didxset.lo \
    86121        enter.lo gzstream.lo idxset.lo leave.lo mpsinput.lo nameset.lo \
    … …  
    96131        spxsteeppr.lo spxsumst.lo spxvecs.lo spxvectorst.lo \
    97132        spxweightpr.lo spxweightst.lo spxwritestate.lo statistics.lo \
    98         timer.lo unitvector.lo updatevector.lo
     133        unitvector.lo updatevector.lo $(am__objects_1) \
     134        $(am__objects_2)
    99135libcoinsoplex_la_OBJECTS = $(am_libcoinsoplex_la_OBJECTS)
    100136depcomp = $(SHELL) $(top_srcdir)/depcomp
    … …  
    109145        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    110146SOURCES = $(libcoinsoplex_la_SOURCES)
    111 DIST_SOURCES = $(libcoinsoplex_la_SOURCES)
     147DIST_SOURCES = $(am__libcoinsoplex_la_SOURCES_DIST)
    112148pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    113149DATA = $(pkgconfiglib_DATA)
    … …  
    219255SOPLEX_SVN_REV = @SOPLEX_SVN_REV@
    220256STRIP = @STRIP@
     257TIMER_IS_USERTIMER_FALSE = @TIMER_IS_USERTIMER_FALSE@
     258TIMER_IS_USERTIMER_TRUE = @TIMER_IS_USERTIMER_TRUE@
    221259VERSION = @VERSION@
    222260VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    … …  
    277315target_alias = @target_alias@
    278316AUTOMAKE_OPTIONS = foreign
    279 EXTRA_DIST = $(am__append_1)
     317EXTRA_DIST = $(am__append_3)
    280318lib_LTLIBRARIES = libcoinsoplex.la
    281 libcoinsoplex_la_SOURCES = \
    282   soplex/src/changesoplex.cpp \
    283   soplex/src/clufactor.cpp \
    284   soplex/src/didxset.cpp \
    285   soplex/src/enter.cpp \
    286   soplex/src/gzstream.cpp \
    287   soplex/src/idxset.cpp \
    288   soplex/src/leave.cpp \
    289   soplex/src/mpsinput.cpp \
    290   soplex/src/nameset.cpp \
    291   soplex/src/rational.cpp \
    292   soplex/src/slufactor.cpp \
    293   soplex/src/solverational.cpp \
    294   soplex/src/solvereal.cpp \
    295   soplex/src/soplex.cpp \
    296   soplex/src/soplexlegacy.cpp \
    297   soplex/src/spxautopr.cpp \
    298   soplex/src/spxbasis.cpp \
    299   soplex/src/spxboundflippingrt.cpp \
    300   soplex/src/spxbounds.cpp \
    301   soplex/src/spxchangebasis.cpp \
    302   soplex/src/spxdantzigpr.cpp \
    303   soplex/src/spxdefaultrt.cpp \
    304   soplex/src/spxdefines.cpp \
    305   soplex/src/spxdesc.cpp \
    306   soplex/src/spxdevexpr.cpp \
    307   soplex/src/spxequilisc.cpp \
    308   soplex/src/spxfastrt.cpp \
    309   soplex/src/spxfileio.cpp \
    310   soplex/src/spxgeometsc.cpp \
    311   soplex/src/spxgithash.cpp \
    312   soplex/src/spxharrisrt.cpp \
    313   soplex/src/spxhybridpr.cpp \
    314   soplex/src/spxid.cpp \
    315   soplex/src/spxlpbase_rational.cpp \
    316   soplex/src/spxlpbase_real.cpp \
    317   soplex/src/spxmainsm.cpp \
    318   soplex/src/spxout.cpp \
    319   soplex/src/spxparmultpr.cpp \
    320   soplex/src/spxquality.cpp \
    321   soplex/src/spxscaler.cpp \
    322   soplex/src/spxshift.cpp \
    323   soplex/src/spxsolver.cpp \
    324   soplex/src/spxsolve.cpp \
    325   soplex/src/spxstarter.cpp \
    326   soplex/src/spxsteeppr.cpp \
    327   soplex/src/spxsumst.cpp \
    328   soplex/src/spxvecs.cpp \
    329   soplex/src/spxvectorst.cpp \
    330   soplex/src/spxweightpr.cpp \
    331   soplex/src/spxweightst.cpp \
    332   soplex/src/spxwritestate.cpp \
    333   soplex/src/statistics.cpp \
    334   soplex/src/timer.cpp \
    335   soplex/src/unitvector.cpp \
    336   soplex/src/updatevector.cpp
    337 
     319libcoinsoplex_la_SOURCES = soplex/src/changesoplex.cpp \
     320        soplex/src/clufactor.cpp soplex/src/didxset.cpp \
     321        soplex/src/enter.cpp soplex/src/gzstream.cpp \
     322        soplex/src/idxset.cpp soplex/src/leave.cpp \
     323        soplex/src/mpsinput.cpp soplex/src/nameset.cpp \
     324        soplex/src/rational.cpp soplex/src/slufactor.cpp \
     325        soplex/src/solverational.cpp soplex/src/solvereal.cpp \
     326        soplex/src/soplex.cpp soplex/src/soplexlegacy.cpp \
     327        soplex/src/spxautopr.cpp soplex/src/spxbasis.cpp \
     328        soplex/src/spxboundflippingrt.cpp soplex/src/spxbounds.cpp \
     329        soplex/src/spxchangebasis.cpp soplex/src/spxdantzigpr.cpp \
     330        soplex/src/spxdefaultrt.cpp soplex/src/spxdefines.cpp \
     331        soplex/src/spxdesc.cpp soplex/src/spxdevexpr.cpp \
     332        soplex/src/spxequilisc.cpp soplex/src/spxfastrt.cpp \
     333        soplex/src/spxfileio.cpp soplex/src/spxgeometsc.cpp \
     334        soplex/src/spxgithash.cpp soplex/src/spxharrisrt.cpp \
     335        soplex/src/spxhybridpr.cpp soplex/src/spxid.cpp \
     336        soplex/src/spxlpbase_rational.cpp \
     337        soplex/src/spxlpbase_real.cpp soplex/src/spxmainsm.cpp \
     338        soplex/src/spxout.cpp soplex/src/spxparmultpr.cpp \
     339        soplex/src/spxquality.cpp soplex/src/spxscaler.cpp \
     340        soplex/src/spxshift.cpp soplex/src/spxsolver.cpp \
     341        soplex/src/spxsolve.cpp soplex/src/spxstarter.cpp \
     342        soplex/src/spxsteeppr.cpp soplex/src/spxsumst.cpp \
     343        soplex/src/spxvecs.cpp soplex/src/spxvectorst.cpp \
     344        soplex/src/spxweightpr.cpp soplex/src/spxweightst.cpp \
     345        soplex/src/spxwritestate.cpp soplex/src/statistics.cpp \
     346        soplex/src/unitvector.cpp soplex/src/updatevector.cpp \
     347        $(am__append_1) $(am__append_2)
    338348AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/soplex/src`
    339349DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    … …  
    434444
    435445# Files that are generated and should be cleaned with make distclean
    436 DISTCLEANFILES = $(MAKEOKFILE) $(am__append_2) $(VPATH_DISTCLEANFILES)
     446DISTCLEANFILES = $(MAKEOKFILE) $(am__append_4) $(VPATH_DISTCLEANFILES)
    437447DocFiles = README AUTHORS LICENSE
    438448DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
    … …  
    587597@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitvector.Plo@am__quote@
    588598@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updatevector.Plo@am__quote@
     599@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usertimer.Plo@am__quote@
     600@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wallclocktimer.Plo@am__quote@
    589601
    590602.cpp.o:
    … …  
    973985@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o statistics.lo `test -f 'soplex/src/statistics.cpp' || echo '$(srcdir)/'`soplex/src/statistics.cpp
    974986
     987unitvector.lo: soplex/src/unitvector.cpp
     988@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unitvector.lo -MD -MP -MF "$(DEPDIR)/unitvector.Tpo" -c -o unitvector.lo `test -f 'soplex/src/unitvector.cpp' || echo '$(srcdir)/'`soplex/src/unitvector.cpp; \
     989@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/unitvector.Tpo" "$(DEPDIR)/unitvector.Plo"; else rm -f "$(DEPDIR)/unitvector.Tpo"; exit 1; fi
     990@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='soplex/src/unitvector.cpp' object='unitvector.lo' libtool=yes @AMDEPBACKSLASH@
     991@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     992@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unitvector.lo `test -f 'soplex/src/unitvector.cpp' || echo '$(srcdir)/'`soplex/src/unitvector.cpp
     993
     994updatevector.lo: soplex/src/updatevector.cpp
     995@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT updatevector.lo -MD -MP -MF "$(DEPDIR)/updatevector.Tpo" -c -o updatevector.lo `test -f 'soplex/src/updatevector.cpp' || echo '$(srcdir)/'`soplex/src/updatevector.cpp; \
     996@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/updatevector.Tpo" "$(DEPDIR)/updatevector.Plo"; else rm -f "$(DEPDIR)/updatevector.Tpo"; exit 1; fi
     997@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='soplex/src/updatevector.cpp' object='updatevector.lo' libtool=yes @AMDEPBACKSLASH@
     998@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     999@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o updatevector.lo `test -f 'soplex/src/updatevector.cpp' || echo '$(srcdir)/'`soplex/src/updatevector.cpp
     1000
     1001usertimer.lo: soplex/src/usertimer.cpp
     1002@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT usertimer.lo -MD -MP -MF "$(DEPDIR)/usertimer.Tpo" -c -o usertimer.lo `test -f 'soplex/src/usertimer.cpp' || echo '$(srcdir)/'`soplex/src/usertimer.cpp; \
     1003@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/usertimer.Tpo" "$(DEPDIR)/usertimer.Plo"; else rm -f "$(DEPDIR)/usertimer.Tpo"; exit 1; fi
     1004@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='soplex/src/usertimer.cpp' object='usertimer.lo' libtool=yes @AMDEPBACKSLASH@
     1005@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1006@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o usertimer.lo `test -f 'soplex/src/usertimer.cpp' || echo '$(srcdir)/'`soplex/src/usertimer.cpp
     1007
     1008wallclocktimer.lo: soplex/src/wallclocktimer.cpp
     1009@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wallclocktimer.lo -MD -MP -MF "$(DEPDIR)/wallclocktimer.Tpo" -c -o wallclocktimer.lo `test -f 'soplex/src/wallclocktimer.cpp' || echo '$(srcdir)/'`soplex/src/wallclocktimer.cpp; \
     1010@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/wallclocktimer.Tpo" "$(DEPDIR)/wallclocktimer.Plo"; else rm -f "$(DEPDIR)/wallclocktimer.Tpo"; exit 1; fi
     1011@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='soplex/src/wallclocktimer.cpp' object='wallclocktimer.lo' libtool=yes @AMDEPBACKSLASH@
     1012@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1013@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wallclocktimer.lo `test -f 'soplex/src/wallclocktimer.cpp' || echo '$(srcdir)/'`soplex/src/wallclocktimer.cpp
     1014
    9751015timer.lo: soplex/src/timer.cpp
    9761016@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT timer.lo -MD -MP -MF "$(DEPDIR)/timer.Tpo" -c -o timer.lo `test -f 'soplex/src/timer.cpp' || echo '$(srcdir)/'`soplex/src/timer.cpp; \
    … …  
    9791019@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    9801020@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o timer.lo `test -f 'soplex/src/timer.cpp' || echo '$(srcdir)/'`soplex/src/timer.cpp
    981 
    982 unitvector.lo: soplex/src/unitvector.cpp
    983 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unitvector.lo -MD -MP -MF "$(DEPDIR)/unitvector.Tpo" -c -o unitvector.lo `test -f 'soplex/src/unitvector.cpp' || echo '$(srcdir)/'`soplex/src/unitvector.cpp; \
    984 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/unitvector.Tpo" "$(DEPDIR)/unitvector.Plo"; else rm -f "$(DEPDIR)/unitvector.Tpo"; exit 1; fi
    985 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='soplex/src/unitvector.cpp' object='unitvector.lo' libtool=yes @AMDEPBACKSLASH@
    986 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    987 @am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unitvector.lo `test -f 'soplex/src/unitvector.cpp' || echo '$(srcdir)/'`soplex/src/unitvector.cpp
    988 
    989 updatevector.lo: soplex/src/updatevector.cpp
    990 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT updatevector.lo -MD -MP -MF "$(DEPDIR)/updatevector.Tpo" -c -o updatevector.lo `test -f 'soplex/src/updatevector.cpp' || echo '$(srcdir)/'`soplex/src/updatevector.cpp; \
    991 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/updatevector.Tpo" "$(DEPDIR)/updatevector.Plo"; else rm -f "$(DEPDIR)/updatevector.Tpo"; exit 1; fi
    992 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='soplex/src/updatevector.cpp' object='updatevector.lo' libtool=yes @AMDEPBACKSLASH@
    993 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    994 @am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o updatevector.lo `test -f 'soplex/src/updatevector.cpp' || echo '$(srcdir)/'`soplex/src/updatevector.cpp
    9951021
    9961022mostlyclean-libtool:

  • ThirdParty/SoPlex/trunk/configure

    r3227 r3262  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion SOPLEX_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE SOPLEX_CFLAGS SOPLEX_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion SOPLEX_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE SOPLEX_CFLAGS TIMER_IS_USERTIMER_TRUE TIMER_IS_USERTIMER_FALSE SOPLEX_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
    … …  
    20222022             fi
    20232023             ;;
     2024  *-*-darwin*) comps="clang gcc cc" ;;
    20242025  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    20252026  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    … …  
    31803181  *-*-solaris*)
    31813182             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    3182   *-darwin*) comps="g++ c++ CC" ;;
     3183  *-darwin*) comps="clang++ g++ c++ CC" ;;
    31833184  *-linux-gnu*)
    31843185             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
    … …  
    36173618# It seems that we need to cleanup something here for the Windows
    36183619case "$CXX" in
    3619   clang* ) ;;
     3620  clang* | */clang*) ;;
    36203621  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    36213622    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
    … …  
    59996000*-*-irix6*)
    60006001  # Find out which ABI we are using.
    6001   echo '#line 6001 "configure"' > conftest.$ac_ext
     6002  echo '#line 6002 "configure"' > conftest.$ac_ext
    60026003  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    60036004  (eval $ac_compile) 2>&5
    … …  
    71337134
    71347135# Provide some information about the compiler.
    7135 echo "$as_me:7135:" \
     7136echo "$as_me:7136:" \
    71367137     "checking for Fortran 77 compiler version" >&5
    71377138ac_compiler=`set X $ac_compile; echo $2`
    … …  
    82008201   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82018202   -e 's:$: $lt_compiler_flag:'`
    8202    (eval echo "\"\$as_me:8202: $lt_compile\"" >&5)
     8203   (eval echo "\"\$as_me:8203: $lt_compile\"" >&5)
    82038204   (eval "$lt_compile" 2>conftest.err)
    82048205   ac_status=$?
    82058206   cat conftest.err >&5
    8206    echo "$as_me:8206: \$? = $ac_status" >&5
     8207   echo "$as_me:8207: \$? = $ac_status" >&5
    82078208   if (exit $ac_status) && test -s "$ac_outfile"; then
    82088209     # The compiler can only warn and ignore the option if not recognized
    … …  
    84688469   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84698470   -e 's:$: $lt_compiler_flag:'`
    8470    (eval echo "\"\$as_me:8470: $lt_compile\"" >&5)
     8471   (eval echo "\"\$as_me:8471: $lt_compile\"" >&5)
    84718472   (eval "$lt_compile" 2>conftest.err)
    84728473   ac_status=$?
    84738474   cat conftest.err >&5
    8474    echo "$as_me:8474: \$? = $ac_status" >&5
     8475   echo "$as_me:8475: \$? = $ac_status" >&5
    84758476   if (exit $ac_status) && test -s "$ac_outfile"; then
    84768477     # The compiler can only warn and ignore the option if not recognized
    … …  
    85728573   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    85738574   -e 's:$: $lt_compiler_flag:'`
    8574    (eval echo "\"\$as_me:8574: $lt_compile\"" >&5)
     8575   (eval echo "\"\$as_me:8575: $lt_compile\"" >&5)
    85758576   (eval "$lt_compile" 2>out/conftest.err)
    85768577   ac_status=$?
    85778578   cat out/conftest.err >&5
    8578    echo "$as_me:8578: \$? = $ac_status" >&5
     8579   echo "$as_me:8579: \$? = $ac_status" >&5
    85798580   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    85808581   then
    … …  
    1091710918  lt_status=$lt_dlunknown
    1091810919  cat > conftest.$ac_ext <<EOF
    10919 #line 10919 "configure"
     10920#line 10920 "configure"
    1092010921#include "confdefs.h"
    1092110922
    … …  
    1101711018  lt_status=$lt_dlunknown
    1101811019  cat > conftest.$ac_ext <<EOF
    11019 #line 11019 "configure"
     11020#line 11020 "configure"
    1102011021#include "confdefs.h"
    1102111022
    … …  
    1336113362   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1336213363   -e 's:$: $lt_compiler_flag:'`
    13363    (eval echo "\"\$as_me:13363: $lt_compile\"" >&5)
     13364   (eval echo "\"\$as_me:13364: $lt_compile\"" >&5)
    1336413365   (eval "$lt_compile" 2>conftest.err)
    1336513366   ac_status=$?
    1336613367   cat conftest.err >&5
    13367    echo "$as_me:13367: \$? = $ac_status" >&5
     13368   echo "$as_me:13368: \$? = $ac_status" >&5
    1336813369   if (exit $ac_status) && test -s "$ac_outfile"; then
    1336913370     # The compiler can only warn and ignore the option if not recognized
    … …  
    1346513466   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1346613467   -e 's:$: $lt_compiler_flag:'`
    13467    (eval echo "\"\$as_me:13467: $lt_compile\"" >&5)
     13468   (eval echo "\"\$as_me:13468: $lt_compile\"" >&5)
    1346813469   (eval "$lt_compile" 2>out/conftest.err)
    1346913470   ac_status=$?
    1347013471   cat out/conftest.err >&5
    13471    echo "$as_me:13471: \$? = $ac_status" >&5
     13472   echo "$as_me:13472: \$? = $ac_status" >&5
    1347213473   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1347313474   then
    … …  
    1503515036   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1503615037   -e 's:$: $lt_compiler_flag:'`
    15037    (eval echo "\"\$as_me:15037: $lt_compile\"" >&5)
     15038   (eval echo "\"\$as_me:15038: $lt_compile\"" >&5)
    1503815039   (eval "$lt_compile" 2>conftest.err)
    1503915040   ac_status=$?
    1504015041   cat conftest.err >&5
    15041    echo "$as_me:15041: \$? = $ac_status" >&5
     15042   echo "$as_me:15042: \$? = $ac_status" >&5
    1504215043   if (exit $ac_status) && test -s "$ac_outfile"; then
    1504315044     # The compiler can only warn and ignore the option if not recognized
    … …  
    1513915140   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1514015141   -e 's:$: $lt_compiler_flag:'`
    15141    (eval echo "\"\$as_me:15141: $lt_compile\"" >&5)
     15142   (eval echo "\"\$as_me:15142: $lt_compile\"" >&5)
    1514215143   (eval "$lt_compile" 2>out/conftest.err)
    1514315144   ac_status=$?
    1514415145   cat out/conftest.err >&5
    15145    echo "$as_me:15145: \$? = $ac_status" >&5
     15146   echo "$as_me:15146: \$? = $ac_status" >&5
    1514615147   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1514715148   then
    … …  
    1734617347   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1734717348   -e 's:$: $lt_compiler_flag:'`
    17348    (eval echo "\"\$as_me:17348: $lt_compile\"" >&5)
     17349   (eval echo "\"\$as_me:17349: $lt_compile\"" >&5)
    1734917350   (eval "$lt_compile" 2>conftest.err)
    1735017351   ac_status=$?
    1735117352   cat conftest.err >&5
    17352    echo "$as_me:17352: \$? = $ac_status" >&5
     17353   echo "$as_me:17353: \$? = $ac_status" >&5
    1735317354   if (exit $ac_status) && test -s "$ac_outfile"; then
    1735417355     # The compiler can only warn and ignore the option if not recognized
    … …  
    1761417615   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1761517616   -e 's:$: $lt_compiler_flag:'`
    17616    (eval echo "\"\$as_me:17616: $lt_compile\"" >&5)
     17617   (eval echo "\"\$as_me:17617: $lt_compile\"" >&5)
    1761717618   (eval "$lt_compile" 2>conftest.err)
    1761817619   ac_status=$?
    1761917620   cat conftest.err >&5
    17620    echo "$as_me:17620: \$? = $ac_status" >&5
     17621   echo "$as_me:17621: \$? = $ac_status" >&5
    1762117622   if (exit $ac_status) && test -s "$ac_outfile"; then
    1762217623     # The compiler can only warn and ignore the option if not recognized
    … …  
    1771817719   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1771917720   -e 's:$: $lt_compiler_flag:'`
    17720    (eval echo "\"\$as_me:17720: $lt_compile\"" >&5)
     17721   (eval echo "\"\$as_me:17721: $lt_compile\"" >&5)
    1772117722   (eval "$lt_compile" 2>out/conftest.err)
    1772217723   ac_status=$?
    1772317724   cat out/conftest.err >&5
    17724    echo "$as_me:17724: \$? = $ac_status" >&5
     17725   echo "$as_me:17725: \$? = $ac_status" >&5
    1772517726   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1772617727   then
    … …  
    2120321204
    2120421205
     21206# in recent SoPlex 2.0 versions, timer.cpp has been renamed to usertimer.cpp
     21207
     21208
     21209if test -e "$srcdir/soplex/src/usertimer.cpp"; then
     21210  TIMER_IS_USERTIMER_TRUE=
     21211  TIMER_IS_USERTIMER_FALSE='#'
     21212else
     21213  TIMER_IS_USERTIMER_TRUE='#'
     21214  TIMER_IS_USERTIMER_FALSE=
     21215fi
     21216
     21217
    2120521218# TODO SoPlex may not be threadsafe by default; adding -DDISABLE_VERBOSITY could help
    2120621219
    … …  
    2144521458Usually this means the macro was only invoked conditionally." >&5
    2144621459echo "$as_me: error: conditional \"COIN_HAS_ZLIB\" was never defined.
     21460Usually this means the macro was only invoked conditionally." >&2;}
     21461   { (exit 1); exit 1; }; }
     21462fi
     21463if test -z "${TIMER_IS_USERTIMER_TRUE}" && test -z "${TIMER_IS_USERTIMER_FALSE}"; then
     21464  { { echo "$as_me:$LINENO: error: conditional \"TIMER_IS_USERTIMER\" was never defined.
     21465Usually this means the macro was only invoked conditionally." >&5
     21466echo "$as_me: error: conditional \"TIMER_IS_USERTIMER\" was never defined.
    2144721467Usually this means the macro was only invoked conditionally." >&2;}
    2144821468   { (exit 1); exit 1; }; }
    … …  
    2209622116s,@COIN_HAS_ZLIB_FALSE@,$COIN_HAS_ZLIB_FALSE,;t t
    2209722117s,@SOPLEX_CFLAGS@,$SOPLEX_CFLAGS,;t t
     22118s,@TIMER_IS_USERTIMER_TRUE@,$TIMER_IS_USERTIMER_TRUE,;t t
     22119s,@TIMER_IS_USERTIMER_FALSE@,$TIMER_IS_USERTIMER_FALSE,;t t
    2209822120s,@SOPLEX_PCLIBS@,$SOPLEX_PCLIBS,;t t
    2209922121s,@LIBEXT@,$LIBEXT,;t t

  • ThirdParty/SoPlex/trunk/configure.ac

    r3227 r3262  
    8484AC_SUBST(SOPLEX_CFLAGS)
    8585
     86# in recent SoPlex 2.0 versions, timer.cpp has been renamed to usertimer.cpp
     87AM_CONDITIONAL(TIMER_IS_USERTIMER, [test -e "$srcdir/soplex/src/usertimer.cpp"])
     88
    8689# TODO SoPlex may not be threadsafe by default; adding -DDISABLE_VERBOSITY could help
    8790
Note: See TracChangeset for help on using the changeset viewer.