Changeset 2230 for ThirdParty/SCIP


Ignore:
Timestamp:
Jun 2, 2011 6:11:26 PM (8 years ago)
Author:
stefan
Message:

fix for compiling without cppad

Location:
ThirdParty/SCIP/trunk
Files:
2 edited

Legend:

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

    r2229 r2230  
    195195if COIN_HAS_CPPAD
    196196libcoinscip_la_SOURCES += scip/src/nlpi/exprinterpret_cppad.cpp
     197else
     198libcoinscip_la_SOURCES += scip/src/nlpi/exprinterpret_none.c
    197199endif
    198200
  • ThirdParty/SCIP/trunk/Makefile.in

    r2229 r2230  
    6161@COIN_HAS_IPOPT_FALSE@am__append_5 = scip/src/nlpi/nlpi_ipopt_dummy.c
    6262@COIN_HAS_CPPAD_TRUE@am__append_6 = scip/src/nlpi/exprinterpret_cppad.cpp
     63@COIN_HAS_CPPAD_FALSE@am__append_7 = scip/src/nlpi/exprinterpret_none.c
    6364DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
    6465        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
     
    6667        $(srcdir)/config_scip.h.in $(top_srcdir)/configure compile \
    6768        config.guess config.sub depcomp install-sh ltmain.sh missing
    68 @HAVE_EXTERNALS_TRUE@am__append_7 = Dependencies
    69 @HAVE_EXTERNALS_TRUE@am__append_8 = .Dependencies-stamp
     69@HAVE_EXTERNALS_TRUE@am__append_8 = Dependencies
     70@HAVE_EXTERNALS_TRUE@am__append_9 = .Dependencies-stamp
    7071subdir = .
    7172ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    188189        scip/src/scip/lpi_none.cpp scip/src/nlpi/nlpi_ipopt.cpp \
    189190        scip/src/nlpi/nlpi_ipopt_dummy.c \
    190         scip/src/nlpi/exprinterpret_cppad.cpp
     191        scip/src/nlpi/exprinterpret_cppad.cpp \
     192        scip/src/nlpi/exprinterpret_none.c
    191193am__dirstamp = $(am__leading_dot)dirstamp
    192194@COIN_HAS_SOPLEX_TRUE@am__objects_1 = scip/src/scip/lpi_spx.lo
     
    198200@COIN_HAS_CPPAD_TRUE@am__objects_6 =  \
    199201@COIN_HAS_CPPAD_TRUE@   scip/src/nlpi/exprinterpret_cppad.lo
     202@COIN_HAS_CPPAD_FALSE@am__objects_7 =  \
     203@COIN_HAS_CPPAD_FALSE@  scip/src/nlpi/exprinterpret_none.lo
    200204am_libcoinscip_la_OBJECTS = scip/src/scip/branch.lo \
    201205        scip/src/scip/bitencode.lo scip/src/scip/buffer.lo \
     
    301305        scip/src/dijkstra/dijkstra_bh.lo scip/src/xml/xmlparse.lo \
    302306        $(am__objects_1) $(am__objects_2) $(am__objects_3) \
    303         $(am__objects_4) $(am__objects_5) $(am__objects_6)
     307        $(am__objects_4) $(am__objects_5) $(am__objects_6) \
     308        $(am__objects_7)
    304309libcoinscip_la_OBJECTS = $(am_libcoinscip_la_OBJECTS)
    305310depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    525530target_alias = @target_alias@
    526531AUTOMAKE_OPTIONS = foreign
    527 EXTRA_DIST = $(am__append_7)
     532EXTRA_DIST = $(am__append_8)
    528533lib_LTLIBRARIES = libcoinscip.la
    529534libcoinscip_la_SOURCES = scip/src/scip/branch.c \
     
    624629        scip/src/dijkstra/dijkstra_bh.c scip/src/xml/xmlparse.c \
    625630        $(am__append_1) $(am__append_2) $(am__append_3) \
    626         $(am__append_4) $(am__append_5) $(am__append_6)
     631        $(am__append_4) $(am__append_5) $(am__append_6) \
     632        $(am__append_7)
    627633AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/scip/src` $(SCIPLIB_CFLAGS)
    628634DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
     
    634640
    635641# Files that are generated and should be cleaned with make distclean
    636 DISTCLEANFILES = $(am__append_8) $(VPATH_DISTCLEANFILES)
     642DISTCLEANFILES = $(am__append_9) $(VPATH_DISTCLEANFILES)
    637643DocFiles = README AUTHORS LICENSE
    638644DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     
    10981104scip/src/nlpi/exprinterpret_cppad.lo: scip/src/nlpi/$(am__dirstamp) \
    10991105        scip/src/nlpi/$(DEPDIR)/$(am__dirstamp)
     1106scip/src/nlpi/exprinterpret_none.lo: scip/src/nlpi/$(am__dirstamp) \
     1107        scip/src/nlpi/$(DEPDIR)/$(am__dirstamp)
    11001108libcoinscip.la: $(libcoinscip_la_OBJECTS) $(libcoinscip_la_DEPENDENCIES)
    11011109        $(CXXLINK) -rpath $(libdir) $(libcoinscip_la_LDFLAGS) $(libcoinscip_la_OBJECTS) $(libcoinscip_la_LIBADD) $(LIBS)
     
    11111119        -rm -f scip/src/nlpi/exprinterpret_cppad.$(OBJEXT)
    11121120        -rm -f scip/src/nlpi/exprinterpret_cppad.lo
     1121        -rm -f scip/src/nlpi/exprinterpret_none.$(OBJEXT)
     1122        -rm -f scip/src/nlpi/exprinterpret_none.lo
    11131123        -rm -f scip/src/nlpi/intervalarith.$(OBJEXT)
    11141124        -rm -f scip/src/nlpi/intervalarith.lo
     
    14471457@AMDEP_TRUE@@am__include@ @am__quote@scip/src/nlpi/$(DEPDIR)/expression.Plo@am__quote@
    14481458@AMDEP_TRUE@@am__include@ @am__quote@scip/src/nlpi/$(DEPDIR)/exprinterpret_cppad.Plo@am__quote@
     1459@AMDEP_TRUE@@am__include@ @am__quote@scip/src/nlpi/$(DEPDIR)/exprinterpret_none.Plo@am__quote@
    14491460@AMDEP_TRUE@@am__include@ @am__quote@scip/src/nlpi/$(DEPDIR)/intervalarith.Plo@am__quote@
    14501461@AMDEP_TRUE@@am__include@ @am__quote@scip/src/nlpi/$(DEPDIR)/nlpi.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.