Ignore:
Timestamp:
Jun 7, 2010 8:27:42 AM (11 years ago)
Author:
stefan
Message:

merge split branch into trunk; fix some examples

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:externals

      •  

        old new  
        1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        6 Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        7 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        8 Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
        11 Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         6Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
         7#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
         8CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         9Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
         10Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         12#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1437-1439,​1444-1448,​1463

  • trunk/Cbc

  • trunk/Cbc/test/Makefile.in

    r1204 r1464  
    4444host_triplet = @host@
    4545@COIN_HAS_CLP_TRUE@am__append_1 = test_cbc
    46 @CBC_BUILD_CBC_GENERIC_TRUE@am__append_2 = test_cbc_generic
    47 bin_PROGRAMS = gamsTest$(EXEEXT)
    48 @COIN_HAS_CLP_TRUE@am__append_3 = -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    49 @COIN_HAS_CLP_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    50 @COIN_HAS_CLP_TRUE@     -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    51 
    52 @COIN_HAS_CLP_TRUE@am__append_4 = $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    53 @COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la
    54 
    55 @COIN_HAS_CLP_TRUE@am__append_5 = `cat $(CLPOBJDIR)/clp_addlibs.txt`
    56 @COIN_HAS_CPX_TRUE@am__append_6 = -I`$(CYGPATH_W) $(CPXINCDIR)` \
    57 @COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    58 
    59 @COIN_HAS_CPX_TRUE@am__append_7 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    60 @COIN_HAS_DYLP_TRUE@am__append_8 = -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/DylpStdLib` \
    61 @COIN_HAS_DYLP_TRUE@  -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
    62 @COIN_HAS_DYLP_TRUE@  -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
    63 @COIN_HAS_DYLP_TRUE@    -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    64 
    65 @COIN_HAS_DYLP_TRUE@am__append_9 = $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    66 @COIN_HAS_DYLP_TRUE@    $(DYLPOBJDIR)/src/Dylp/libDylp.la
    67 
    68 @COIN_HAS_DYLP_TRUE@am__append_10 = `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
    69 @COIN_HAS_FMP_TRUE@am__append_11 = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    70 @COIN_HAS_FMP_TRUE@am__append_12 = $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    71 @COIN_HAS_GLPK_TRUE@am__append_13 = -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    72 @COIN_HAS_GLPK_TRUE@    -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    73 
    74 @COIN_HAS_GLPK_TRUE@am__append_14 = $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    75 @COIN_HAS_MSK_TRUE@am__append_15 = -I`$(CYGPATH_W) $(MSKINCDIR)` \
    76 @COIN_HAS_MSK_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    77 
    78 @COIN_HAS_MSK_TRUE@am__append_16 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    79 @COIN_HAS_OSL_TRUE@am__append_17 = -I`$(CYGPATH_W) $(OSLINCDIR)` \
    80 @COIN_HAS_OSL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    81 
    82 @COIN_HAS_OSL_TRUE@am__append_18 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    83 @COIN_HAS_SPX_TRUE@am__append_19 = -I`$(CYGPATH_W) $(SPXINCDIR)` \
    84 @COIN_HAS_SPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    85 
    86 @COIN_HAS_SPX_TRUE@am__append_20 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    87 @COIN_HAS_SYMPHONY_TRUE@am__append_21 = -I`$(CYGPATH_W) $(SYMPHONYSRCDIR)/src` \
    88 @COIN_HAS_SYMPHONY_TRUE@        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    89 
    90 @COIN_HAS_SYMPHONY_TRUE@am__append_22 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    91 @COIN_HAS_SYMPHONY_TRUE@        $(SYMPHONYOBJDIR)/src/libSym.la
    92 
    93 @COIN_HAS_SYMPHONY_TRUE@am__append_23 = `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
    94 @COIN_HAS_VOL_TRUE@am__append_24 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    95 @COIN_HAS_VOL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    96 
    97 @COIN_HAS_VOL_TRUE@am__append_25 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    98 @COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    99 
    100 @COIN_HAS_VOL_TRUE@am__append_26 = `cat $(VOLOBJDIR)/vol_addlibs.txt`
    101 @COIN_HAS_XPR_TRUE@am__append_27 = -I`$(CYGPATH_W) $(XPRINCDIR)` \
    102 @COIN_HAS_XPR_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    103 
    104 @COIN_HAS_XPR_TRUE@am__append_28 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    105 @COIN_HAS_ASL_TRUE@am__append_29 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
    106 @COIN_HAS_ASL_TRUE@am__append_30 = $(ASLLIB)
     46@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_SAMPLE_TRUE@am__append_2 = test_cbc_generic
     47@COIN_HAS_SAMPLE_TRUE@am__append_3 = -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
     48@COIN_HAS_SAMPLE_TRUE@am__append_4 = -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
     49@COIN_HAS_MIPLIB3_TRUE@am__append_5 = -dirMiplib `$(CYGPATH_W) $(MIPLIB3_DATA)` -miplib
     50@COIN_HAS_NETLIB_TRUE@am__append_6 = -netlibDir=`$(CYGPATH_W) $(NETLIB_DATA)` -testOsiSolverInterface
     51bin_PROGRAMS = gamsTest$(EXEEXT) osiUnitTest$(EXEEXT)
     52@COIN_HAS_CLP_TRUE@am__append_7 = $(CLP_CFLAGS)
     53@COIN_HAS_CLP_TRUE@am__append_8 = $(CLP_LIBS)
     54@COIN_HAS_CPX_TRUE@am__append_9 = $(CPX_CFLAGS)
     55@COIN_HAS_CPX_TRUE@am__append_10 = $(CPX_LIBS)
     56@COIN_HAS_DYLP_TRUE@am__append_11 = $(DYLP_CFLAGS)
     57@COIN_HAS_DYLP_TRUE@am__append_12 = $(DYLP_LIBS)
     58@COIN_HAS_GLPK_TRUE@am__append_13 = $(GLPK_CFLAGS)
     59@COIN_HAS_GLPK_TRUE@am__append_14 = $(GLPK_LIBS)
     60@COIN_HAS_MSK_TRUE@am__append_15 = $(MSK_CFLAGS)
     61@COIN_HAS_MSK_TRUE@am__append_16 = $(MSK_LIBS)
     62
     63# if COIN_HAS_SPX
     64#   AM_CPPFLAGS += $(SPX_CFLAGS)
     65#   gamsTest_LDADD += $(SPX_LIBS)
     66# endif
     67@COIN_HAS_VOL_TRUE@am__append_17 = $(VOL_CFLAGS)
     68@COIN_HAS_VOL_TRUE@am__append_18 = $(VOL_LIBS)
     69@COIN_HAS_XPR_TRUE@am__append_19 = $(XPR_CFLAGS)
     70@COIN_HAS_XPR_TRUE@am__append_20 = $(XPR_LIBS)
     71@COIN_HAS_ASL_TRUE@am__append_21 = $(ASL_CFLAGS)
     72@COIN_HAS_ASL_TRUE@am__append_22 = $(ASL_LIBS)
    10773subdir = test
    10874DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    12086am_gamsTest_OBJECTS = gamsTest.$(OBJEXT)
    12187gamsTest_OBJECTS = $(am_gamsTest_OBJECTS)
    122 @COIN_HAS_CLP_TRUE@am__DEPENDENCIES_1 =  \
    123 @COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    124 @COIN_HAS_CLP_TRUE@     $(CLPOBJDIR)/src/libClp.la
    125 @COIN_HAS_CPX_TRUE@am__DEPENDENCIES_2 =  \
    126 @COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    127 @COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_3 =  \
    128 @COIN_HAS_DYLP_TRUE@    $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    129 @COIN_HAS_DYLP_TRUE@    $(DYLPOBJDIR)/src/Dylp/libDylp.la
    130 @COIN_HAS_FMP_TRUE@am__DEPENDENCIES_4 =  \
    131 @COIN_HAS_FMP_TRUE@     $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    132 @COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_5 =  \
    133 @COIN_HAS_GLPK_TRUE@    $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    134 @COIN_HAS_MSK_TRUE@am__DEPENDENCIES_6 =  \
    135 @COIN_HAS_MSK_TRUE@     $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    136 @COIN_HAS_OSL_TRUE@am__DEPENDENCIES_7 =  \
    137 @COIN_HAS_OSL_TRUE@     $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    138 @COIN_HAS_SPX_TRUE@am__DEPENDENCIES_8 =  \
    139 @COIN_HAS_SPX_TRUE@     $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    140 @COIN_HAS_SYMPHONY_TRUE@am__DEPENDENCIES_9 =  \
    141 @COIN_HAS_SYMPHONY_TRUE@        $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    142 @COIN_HAS_SYMPHONY_TRUE@        $(SYMPHONYOBJDIR)/src/libSym.la
    143 @COIN_HAS_VOL_TRUE@am__DEPENDENCIES_10 =  \
    144 @COIN_HAS_VOL_TRUE@     $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    145 @COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    146 @COIN_HAS_XPR_TRUE@am__DEPENDENCIES_11 =  \
    147 @COIN_HAS_XPR_TRUE@     $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    148 am__DEPENDENCIES_12 =
    149 @COIN_HAS_ASL_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_12)
     88am__DEPENDENCIES_1 =
     89@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
     90@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
     91@COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
     92@COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
     93@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
     94@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
     95@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
     96@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
    15097gamsTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la \
    151         $(CGLOBJDIR)/src/libCgl.la $(am__DEPENDENCIES_1) \
     98        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
    15299        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
    153100        $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
    154101        $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
    155         $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9) \
    156         $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11) \
    157         $(am__DEPENDENCIES_13) $(OSIOBJDIR)/src/libOsi.la \
    158         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     102        $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9)
     103am_osiUnitTest_OBJECTS = osiUnitTest.$(OBJEXT) \
     104        OsiCbcSolverInterfaceTest.$(OBJEXT)
     105osiUnitTest_OBJECTS = $(am_osiUnitTest_OBJECTS)
     106osiUnitTest_DEPENDENCIES = ../src/libCbc.la ../src/OsiCbc/libOsiCbc.la \
     107        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
     108        $(am__DEPENDENCIES_1)
    159109DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    160110depcomp = $(SHELL) $(top_srcdir)/../depcomp
    … …  
    168118CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
    169119        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    170 SOURCES = $(gamsTest_SOURCES)
    171 DIST_SOURCES = $(gamsTest_SOURCES)
     120SOURCES = $(gamsTest_SOURCES) $(osiUnitTest_SOURCES)
     121DIST_SOURCES = $(gamsTest_SOURCES) $(osiUnitTest_SOURCES)
    172122ETAGS = etags
    173123CTAGS = ctags
    174124DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
     125ABSBUILDDIR = @ABSBUILDDIR@
    175126ACLOCAL = @ACLOCAL@
    176127ADDLIBS = @ADDLIBS@
    … …  
    183134AMTAR = @AMTAR@
    184135AR = @AR@
    185 ASLLIB = @ASLLIB@
    186 ASL_CPPFLAGS = @ASL_CPPFLAGS@
     136ASL_CFLAGS = @ASL_CFLAGS@
     137ASL_DATA = @ASL_DATA@
     138ASL_LIBS = @ASL_LIBS@
    187139AUTOCONF = @AUTOCONF@
    188140AUTOHEADER = @AUTOHEADER@
    … …  
    191143AWK = @AWK@
    192144BUILDTOOLSDIR = @BUILDTOOLSDIR@
    193 CBCDOCDIR = @CBCDOCDIR@
    194 CBCOBJDIR = @CBCOBJDIR@
    195 CBCSRCDIR = @CBCSRCDIR@
    196145CBC_BUILD_CBC_GENERIC_FALSE = @CBC_BUILD_CBC_GENERIC_FALSE@
    197146CBC_BUILD_CBC_GENERIC_TRUE = @CBC_BUILD_CBC_GENERIC_TRUE@
     147CBC_SVN_REV = @CBC_SVN_REV@
    198148CC = @CC@
    199149CCDEPMODE = @CCDEPMODE@
    200150CDEFS = @CDEFS@
    201151CFLAGS = @CFLAGS@
    202 CGLDOCDIR = @CGLDOCDIR@
    203 CGLOBJDIR = @CGLOBJDIR@
    204 CGLSRCDIR = @CGLSRCDIR@
    205 CLPDOCDIR = @CLPDOCDIR@
    206 CLPOBJDIR = @CLPOBJDIR@
    207 CLPSRCDIR = @CLPSRCDIR@
    208 COINUTILSDOCDIR = @COINUTILSDOCDIR@
    209 COINUTILSOBJDIR = @COINUTILSOBJDIR@
    210 COINUTILSSRCDIR = @COINUTILSSRCDIR@
    211 COIN_BUILD_GLPK_FALSE = @COIN_BUILD_GLPK_FALSE@
    212 COIN_BUILD_GLPK_TRUE = @COIN_BUILD_GLPK_TRUE@
     152CLP_CFLAGS = @CLP_CFLAGS@
     153CLP_DATA = @CLP_DATA@
     154CLP_LIBS = @CLP_LIBS@
     155COINDEPEND_CFLAGS = @COINDEPEND_CFLAGS@
     156COINDEPEND_DATA = @COINDEPEND_DATA@
     157COINDEPEND_LIBS = @COINDEPEND_LIBS@
    213158COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    214159COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
    215 COIN_HAS_CBC_FALSE = @COIN_HAS_CBC_FALSE@
    216 COIN_HAS_CBC_TRUE = @COIN_HAS_CBC_TRUE@
    217 COIN_HAS_CGL_FALSE = @COIN_HAS_CGL_FALSE@
    218 COIN_HAS_CGL_TRUE = @COIN_HAS_CGL_TRUE@
    219160COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    220161COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    221 COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    222 COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
     162COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
     163COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
    223164COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    224165COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
    225166COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
    226167COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
    227 COIN_HAS_FMP_FALSE = @COIN_HAS_FMP_FALSE@
    228 COIN_HAS_FMP_TRUE = @COIN_HAS_FMP_TRUE@
    229168COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
    230169COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
     170COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
     171COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
     172COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
     173COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
    231174COIN_HAS_MSK_FALSE = @COIN_HAS_MSK_FALSE@
    232175COIN_HAS_MSK_TRUE = @COIN_HAS_MSK_TRUE@
    233 COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
    234 COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    235 COIN_HAS_OSL_FALSE = @COIN_HAS_OSL_FALSE@
    236 COIN_HAS_OSL_TRUE = @COIN_HAS_OSL_TRUE@
    237 COIN_HAS_SPX_FALSE = @COIN_HAS_SPX_FALSE@
    238 COIN_HAS_SPX_TRUE = @COIN_HAS_SPX_TRUE@
    239 COIN_HAS_SYMPHONY_FALSE = @COIN_HAS_SYMPHONY_FALSE@
    240 COIN_HAS_SYMPHONY_TRUE = @COIN_HAS_SYMPHONY_TRUE@
     176COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
     177COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     178COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
     179COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     180COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     181COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     182COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
     183COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
    241184COIN_HAS_VOL_FALSE = @COIN_HAS_VOL_FALSE@
    242185COIN_HAS_VOL_TRUE = @COIN_HAS_VOL_TRUE@
    243186COIN_HAS_XPR_FALSE = @COIN_HAS_XPR_FALSE@
    244187COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
     188COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    245189CPP = @CPP@
    246190CPPFLAGS = @CPPFLAGS@
    247 CPXDOCDIR = @CPXDOCDIR@
    248 CPXINCDIR = @CPXINCDIR@
    249 CPXLIB = @CPXLIB@
    250 CPXOBJDIR = @CPXOBJDIR@
    251 CPXSRCDIR = @CPXSRCDIR@
     191CPX_CFLAGS = @CPX_CFLAGS@
     192CPX_DATA = @CPX_DATA@
     193CPX_LIBS = @CPX_LIBS@
    252194CXX = @CXX@
    253195CXXCPP = @CXXCPP@
    … …  
    260202DEFS = @DEFS@
    261203DEPDIR = @DEPDIR@
    262 DYLPDOCDIR = @DYLPDOCDIR@
    263 DYLPOBJDIR = @DYLPOBJDIR@
    264 DYLPSRCDIR = @DYLPSRCDIR@
     204DYLP_CFLAGS = @DYLP_CFLAGS@
     205DYLP_DATA = @DYLP_DATA@
     206DYLP_LIBS = @DYLP_LIBS@
    265207ECHO = @ECHO@
    266208ECHO_C = @ECHO_C@
    … …  
    272214FADDLIBS = @FADDLIBS@
    273215FFLAGS = @FFLAGS@
    274 FMPINCDIR = @FMPINCDIR@
    275 FMPLIB = @FMPLIB@
    276 GLPKINCDIR = @GLPKINCDIR@
    277 GLPKLIB = @GLPKLIB@
    278 GLPKOBJDIR = @GLPKOBJDIR@
     216GLPK_CFLAGS = @GLPK_CFLAGS@
     217GLPK_DATA = @GLPK_DATA@
     218GLPK_LIBS = @GLPK_LIBS@
     219GRB_CFLAGS = @GRB_CFLAGS@
     220GRB_DATA = @GRB_DATA@
     221GRB_LIBS = @GRB_LIBS@
    279222HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    280223HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
    … …  
    286229LIBEXT = @LIBEXT@
    287230LIBOBJS = @LIBOBJS@
    288 LIBS = `cat $(CBCOBJDIR)/cbc_addlibs.txt` $(ADDLIBS) $(am__append_5) \
    289         $(am__append_10) $(am__append_23) $(am__append_26) `cat \
    290         $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
     231LIBS = @LIBS@
    291232LIBTOOL = @LIBTOOL@
    292233LIBTOOLM4 = @LIBTOOLM4@
    … …  
    298239MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    299240MAKEINFO = @MAKEINFO@
     241MIPLIB3_CFLAGS = @MIPLIB3_CFLAGS@
     242MIPLIB3_DATA = @MIPLIB3_DATA@
     243MIPLIB3_LIBS = @MIPLIB3_LIBS@
    300244MPICC = @MPICC@
    301245MPICXX = @MPICXX@
    302 MSKINCDIR = @MSKINCDIR@
    303 MSKLIB = @MSKLIB@
     246MSK_CFLAGS = @MSK_CFLAGS@
     247MSK_DATA = @MSK_DATA@
     248MSK_LIBS = @MSK_LIBS@
     249NETLIB_CFLAGS = @NETLIB_CFLAGS@
     250NETLIB_DATA = @NETLIB_DATA@
     251NETLIB_LIBS = @NETLIB_LIBS@
    304252OBJEXT = @OBJEXT@
    305253OPT_CFLAGS = @OPT_CFLAGS@
    306254OPT_CXXFLAGS = @OPT_CXXFLAGS@
    307 OSIDOCDIR = @OSIDOCDIR@
    308 OSIOBJDIR = @OSIOBJDIR@
    309 OSISRCDIR = @OSISRCDIR@
    310 OSLINCDIR = @OSLINCDIR@
    311 OSLLIB = @OSLLIB@
     255OSICBC_DFLT_SOLVER_CLP_FALSE = @OSICBC_DFLT_SOLVER_CLP_FALSE@
     256OSICBC_DFLT_SOLVER_CLP_TRUE = @OSICBC_DFLT_SOLVER_CLP_TRUE@
     257OSICBC_DFLT_SOLVER_CPX_FALSE = @OSICBC_DFLT_SOLVER_CPX_FALSE@
     258OSICBC_DFLT_SOLVER_CPX_TRUE = @OSICBC_DFLT_SOLVER_CPX_TRUE@
     259OSICBC_DFLT_SOLVER_DYLP_FALSE = @OSICBC_DFLT_SOLVER_DYLP_FALSE@
     260OSICBC_DFLT_SOLVER_DYLP_TRUE = @OSICBC_DFLT_SOLVER_DYLP_TRUE@
     261OSICBC_DFLT_SOLVER_GLPK_FALSE = @OSICBC_DFLT_SOLVER_GLPK_FALSE@
     262OSICBC_DFLT_SOLVER_GLPK_TRUE = @OSICBC_DFLT_SOLVER_GLPK_TRUE@
     263OSICBC_DFLT_SOLVER_GRB_FALSE = @OSICBC_DFLT_SOLVER_GRB_FALSE@
     264OSICBC_DFLT_SOLVER_GRB_TRUE = @OSICBC_DFLT_SOLVER_GRB_TRUE@
     265OSICBC_DFLT_SOLVER_MSK_FALSE = @OSICBC_DFLT_SOLVER_MSK_FALSE@
     266OSICBC_DFLT_SOLVER_MSK_TRUE = @OSICBC_DFLT_SOLVER_MSK_TRUE@
     267OSICBC_DFLT_SOLVER_SYM_FALSE = @OSICBC_DFLT_SOLVER_SYM_FALSE@
     268OSICBC_DFLT_SOLVER_SYM_TRUE = @OSICBC_DFLT_SOLVER_SYM_TRUE@
     269OSICBC_DFLT_SOLVER_VOL_FALSE = @OSICBC_DFLT_SOLVER_VOL_FALSE@
     270OSICBC_DFLT_SOLVER_VOL_TRUE = @OSICBC_DFLT_SOLVER_VOL_TRUE@
     271OSICBC_DFLT_SOLVER_XPR_FALSE = @OSICBC_DFLT_SOLVER_XPR_FALSE@
     272OSICBC_DFLT_SOLVER_XPR_TRUE = @OSICBC_DFLT_SOLVER_XPR_TRUE@
     273OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     274OSITESTS_DATA = @OSITESTS_DATA@
     275OSITESTS_LIBS = @OSITESTS_LIBS@
    312276PACKAGE = @PACKAGE@
    313277PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    317281PACKAGE_VERSION = @PACKAGE_VERSION@
    318282PATH_SEPARATOR = @PATH_SEPARATOR@
     283PKG_CONFIG = @PKG_CONFIG@
    319284RANLIB = @RANLIB@
     285REQUIREDPACKAGES = @REQUIREDPACKAGES@
    320286RPATH_FLAGS = @RPATH_FLAGS@
     287SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
     288SAMPLE_DATA = @SAMPLE_DATA@
     289SAMPLE_LIBS = @SAMPLE_LIBS@
    321290SET_MAKE = @SET_MAKE@
    322291SHELL = @SHELL@
    323 SPXINCDIR = @SPXINCDIR@
    324 SPXLIB = @SPXLIB@
    325292STRIP = @STRIP@
    326 SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    327 SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    328 SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    329293VERSION = @VERSION@
    330 VOLDOCDIR = @VOLDOCDIR@
    331 VOLOBJDIR = @VOLOBJDIR@
    332 VOLSRCDIR = @VOLSRCDIR@
     294VOL_CFLAGS = @VOL_CFLAGS@
     295VOL_DATA = @VOL_DATA@
     296VOL_LIBS = @VOL_LIBS@
    333297VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    334 XPRINCDIR = @XPRINCDIR@
    335 XPRLIB = @XPRLIB@
     298XPR_CFLAGS = @XPR_CFLAGS@
     299XPR_DATA = @XPR_DATA@
     300XPR_LIBS = @XPR_LIBS@
    336301abs_bin_dir = @abs_bin_dir@
    337302abs_include_dir = @abs_include_dir@
    … …  
    346311ac_ct_STRIP = @ac_ct_STRIP@
    347312ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
     313ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    348314am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    349315am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
    … …  
    366332have_automake = @have_automake@
    367333have_svn = @have_svn@
     334have_svnversion = @have_svnversion@
    368335host = @host@
    369336host_alias = @host_alias@
    … …  
    392359#                         unitTest for Cbc                             #
    393360########################################################################
    394 CBC_TEST_TGTS = gamstests $(am__append_1) $(am__append_2)
     361CBC_TEST_TGTS = gamstests ositests $(am__append_1) $(am__append_2)
     362cbcflags = $(am__append_3) -unitTest $(am__append_5)
     363ositestsflags = $(am__append_4) $(am__append_6)
    395364gamsTest_SOURCES = gamsTest.cpp
    396365gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la \
    397         $(CGLOBJDIR)/src/libCgl.la $(am__append_4) $(am__append_7) \
    398         $(am__append_9) $(am__append_12) $(am__append_14) \
    399         $(am__append_16) $(am__append_18) $(am__append_20) \
    400         $(am__append_22) $(am__append_25) $(am__append_28) \
    401         $(am__append_30) $(OSIOBJDIR)/src/libOsi.la \
    402         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     366        $(COINDEPEND_LIBS) $(ADDLIBS) $(am__append_8) $(am__append_10) \
     367        $(am__append_12) $(am__append_14) $(am__append_16) \
     368        $(am__append_18) $(am__append_20) $(am__append_22)
    403369gamsTest_LDFLAGS = -rpath $(libdir)
    404 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` -I`$(CYGPATH_W) \
    405         $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
    406         $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    407         -I`$(CYGPATH_W) $(OSIOBJDIR)/inc` $(am__append_3) \
    408         $(am__append_6) $(am__append_8) $(am__append_11) \
     370AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS) \
     371        $(am__append_7) $(am__append_9) $(am__append_11) \
    409372        $(am__append_13) $(am__append_15) $(am__append_17) \
    410         $(am__append_19) $(am__append_21) $(am__append_24) \
    411         $(am__append_27) $(am__append_29)
     373        $(am__append_19) $(am__append_21) $(OSITESTS_CFLAGS) \
     374        -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc`
     375
     376########################################################################
     377#                         unitTest for OsiCbc                          #
     378########################################################################
     379osiUnitTest_SOURCES = osiUnitTest.cpp OsiCbcSolverInterfaceTest.cpp
     380osiUnitTest_LDADD = ../src/libCbc.la ../src/OsiCbc/libOsiCbc.la $(COINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)
    412381
    413382########################################################################
    … …  
    482451        @rm -f gamsTest$(EXEEXT)
    483452        $(CXXLINK) $(gamsTest_LDFLAGS) $(gamsTest_OBJECTS) $(gamsTest_LDADD) $(LIBS)
     453osiUnitTest$(EXEEXT): $(osiUnitTest_OBJECTS) $(osiUnitTest_DEPENDENCIES)
     454        @rm -f osiUnitTest$(EXEEXT)
     455        $(CXXLINK) $(osiUnitTest_LDFLAGS) $(osiUnitTest_OBJECTS) $(osiUnitTest_LDADD) $(LIBS)
    484456
    485457mostlyclean-compile:
    … …  
    489461        -rm -f *.tab.c
    490462
     463@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OsiCbcSolverInterfaceTest.Po@am__quote@
    491464@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamsTest.Po@am__quote@
     465@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osiUnitTest.Po@am__quote@
    492466
    493467.cpp.o:
    … …  
    697671
    698672test_cbc: ../src/cbc$(EXEEXT)
    699         if test x"$(DIRMIPLIB)" != x; then \
    700                 MIPLIBARG="-dirMiplib $(DIRMIPLIB) -miplib"; \
    701         fi; \
    702         if test x"$(DIRSAMPLE)" != x; then \
    703                 SAMPLEARG="-dirSample $(DIRSAMPLE)"; \
    704         fi; \
    705         ../src/cbc$(EXEEXT) $$SAMPLEARG -unitTest $$MIPLIBARG
    706 
    707 test_cbc_generic: ../src/cbc-generic$(EXEEXT)
    708         echo "A minimal test is all that cbc-generic can manage just yet."
    709         ../src/cbc-generic$(EXEEXT) \
    710             -directory ../../Data/Sample -import p0033.mps -branch
     673        ../src/cbc$(EXEEXT) $(cbcflags)
     674
     675@COIN_HAS_SAMPLE_TRUE@test_cbc_generic: ../src/cbc-generic$(EXEEXT)
     676@COIN_HAS_SAMPLE_TRUE@  echo "A minimal test is all that cbc-generic can manage just yet."
     677@COIN_HAS_SAMPLE_TRUE@  ../src/cbc-generic$(EXEEXT) \
     678@COIN_HAS_SAMPLE_TRUE@      -directory `$(CYGPATH_W) $(SAMPLE_DATA)` -import p0033.mps -branch
    711679
    712680gamstests: gamsTest$(EXEEXT)
    … …  
    714682
    715683.PHONY: test
     684
     685ositests: osiUnitTest$(EXEEXT)
     686        ./osiUnitTest$(EXEEXT) $(ositestsflags)
    716687# Tell versions [3.59,3.63) of GNU make to not export all variables.
    717688# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.