Changeset 1649 for stable/1.13/Clp/test


Ignore:
Timestamp:
Dec 19, 2010 12:25:22 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev1648, except for half of chgset1635 and except for chgset1643

Location:
stable/1.13/Clp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/1.13/Clp

  • stable/1.13/Clp/test/Makefile.am

    r1603 r1649  
    1919osiUnitTest_SOURCES = osiUnitTest.cpp OsiClpSolverInterfaceTest.cpp
    2020
    21 osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la
     21osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la \
     22  $(CLPLIB_LIBS) $(OSICLP_LIBS) $(OSITESTS_LIBS)
    2223
    23 LIBS += $(CLPLIB_LIBS) $(OSICLP_LIBS) $(OSITESTS_LIBS)
     24osiUnitTest_DEPENDENCIES = ../src/libClp.la ../src/OsiClp/libOsiClp.la \
     25  $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
    2426
    2527AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
  • stable/1.13/Clp/test/Makefile.in

    r1618 r1649  
    4444host_triplet = @host@
    4545@COIN_HAS_OSITESTS_TRUE@noinst_PROGRAMS = osiUnitTest$(EXEEXT)
    46 @COIN_HAS_OSITESTS_TRUE@am__append_1 = $(CLPLIB_LIBS) $(OSICLP_LIBS) $(OSITESTS_LIBS)
    47 @COIN_HAS_SAMPLE_TRUE@am__append_2 = -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
    48 @COIN_HAS_SAMPLE_TRUE@am__append_3 = -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
    49 @COIN_HAS_NETLIB_TRUE@am__append_4 = -dirNetlib `$(CYGPATH_W) $(NETLIB_DATA)` -netlib
    50 @COIN_HAS_NETLIB_TRUE@am__append_5 = -netlibDir=`$(CYGPATH_W) $(NETLIB_DATA)` -testOsiSolverInterface
     46@COIN_HAS_SAMPLE_TRUE@am__append_1 = -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
     47@COIN_HAS_SAMPLE_TRUE@am__append_2 = -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
     48@COIN_HAS_NETLIB_TRUE@am__append_3 = -dirNetlib `$(CYGPATH_W) $(NETLIB_DATA)` -netlib
     49@COIN_HAS_NETLIB_TRUE@am__append_4 = -netlibDir=`$(CYGPATH_W) $(NETLIB_DATA)` -testOsiSolverInterface
    5150subdir = test
    5251DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    6665@COIN_HAS_OSITESTS_TRUE@        OsiClpSolverInterfaceTest.$(OBJEXT)
    6766osiUnitTest_OBJECTS = $(am_osiUnitTest_OBJECTS)
    68 @COIN_HAS_OSITESTS_TRUE@osiUnitTest_DEPENDENCIES = ../src/libClp.la \
    69 @COIN_HAS_OSITESTS_TRUE@        ../src/OsiClp/libOsiClp.la
     67am__DEPENDENCIES_1 =
    7068DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    7169depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    106104CFLAGS = @CFLAGS@
    107105CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
     106CLPLIB_CFLAGS_INSTALLED = @CLPLIB_CFLAGS_INSTALLED@
     107CLPLIB_DEPENDENCIES = @CLPLIB_DEPENDENCIES@
    108108CLPLIB_LIBS = @CLPLIB_LIBS@
     109CLPLIB_LIBS_INSTALLED = @CLPLIB_LIBS_INSTALLED@
    109110CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
    110111CLPLIB_PCREQUIRES = @CLPLIB_PCREQUIRES@
    111112CLP_SVN_REV = @CLP_SVN_REV@
    112113COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
     114COINUTILS_CFLAGS_INSTALLED = @COINUTILS_CFLAGS_INSTALLED@
    113115COINUTILS_DATA = @COINUTILS_DATA@
     116COINUTILS_DATA_INSTALLED = @COINUTILS_DATA_INSTALLED@
     117COINUTILS_DEPENDENCIES = @COINUTILS_DEPENDENCIES@
    114118COINUTILS_LIBS = @COINUTILS_LIBS@
     119COINUTILS_LIBS_INSTALLED = @COINUTILS_LIBS_INSTALLED@
     120COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
     121COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
     122COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
     123COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
    115124COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    116125COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
     
    157166LIBEXT = @LIBEXT@
    158167LIBOBJS = @LIBOBJS@
    159 LIBS = @LIBS@ $(am__append_1)
     168LIBS = @LIBS@
    160169LIBTOOL = @LIBTOOL@
    161170LIBTOOLM4 = @LIBTOOLM4@
     
    170179MPICXX = @MPICXX@
    171180NETLIB_CFLAGS = @NETLIB_CFLAGS@
     181NETLIB_CFLAGS_INSTALLED = @NETLIB_CFLAGS_INSTALLED@
    172182NETLIB_DATA = @NETLIB_DATA@
     183NETLIB_DATA_INSTALLED = @NETLIB_DATA_INSTALLED@
     184NETLIB_DEPENDENCIES = @NETLIB_DEPENDENCIES@
    173185NETLIB_LIBS = @NETLIB_LIBS@
     186NETLIB_LIBS_INSTALLED = @NETLIB_LIBS_INSTALLED@
    174187OBJEXT = @OBJEXT@
    175188OPT_CFLAGS = @OPT_CFLAGS@
    176189OPT_CXXFLAGS = @OPT_CXXFLAGS@
    177190OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
     191OSICLPLIB_CFLAGS_INSTALLED = @OSICLPLIB_CFLAGS_INSTALLED@
     192OSICLPLIB_DEPENDENCIES = @OSICLPLIB_DEPENDENCIES@
    178193OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
     194OSICLPLIB_LIBS_INSTALLED = @OSICLPLIB_LIBS_INSTALLED@
    179195OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@
    180196OSICLPLIB_PCREQUIRES = @OSICLPLIB_PCREQUIRES@
    181197OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     198OSITESTS_CFLAGS_INSTALLED = @OSITESTS_CFLAGS_INSTALLED@
    182199OSITESTS_DATA = @OSITESTS_DATA@
     200OSITESTS_DATA_INSTALLED = @OSITESTS_DATA_INSTALLED@
     201OSITESTS_DEPENDENCIES = @OSITESTS_DEPENDENCIES@
    183202OSITESTS_LIBS = @OSITESTS_LIBS@
     203OSITESTS_LIBS_INSTALLED = @OSITESTS_LIBS_INSTALLED@
    184204OSI_CFLAGS = @OSI_CFLAGS@
     205OSI_CFLAGS_INSTALLED = @OSI_CFLAGS_INSTALLED@
    185206OSI_DATA = @OSI_DATA@
     207OSI_DATA_INSTALLED = @OSI_DATA_INSTALLED@
     208OSI_DEPENDENCIES = @OSI_DEPENDENCIES@
    186209OSI_LIBS = @OSI_LIBS@
     210OSI_LIBS_INSTALLED = @OSI_LIBS_INSTALLED@
    187211PACKAGE = @PACKAGE@
    188212PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    197221RPATH_FLAGS = @RPATH_FLAGS@
    198222SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
     223SAMPLE_CFLAGS_INSTALLED = @SAMPLE_CFLAGS_INSTALLED@
    199224SAMPLE_DATA = @SAMPLE_DATA@
     225SAMPLE_DATA_INSTALLED = @SAMPLE_DATA_INSTALLED@
     226SAMPLE_DEPENDENCIES = @SAMPLE_DEPENDENCIES@
    200227SAMPLE_LIBS = @SAMPLE_LIBS@
     228SAMPLE_LIBS_INSTALLED = @SAMPLE_LIBS_INSTALLED@
    201229SET_MAKE = @SET_MAKE@
    202230SHELL = @SHELL@
     
    267295AUTOMAKE_OPTIONS = foreign
    268296@COIN_HAS_OSITESTS_TRUE@osiUnitTest_SOURCES = osiUnitTest.cpp OsiClpSolverInterfaceTest.cpp
    269 @COIN_HAS_OSITESTS_TRUE@osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la
     297@COIN_HAS_OSITESTS_TRUE@osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la \
     298@COIN_HAS_OSITESTS_TRUE@  $(CLPLIB_LIBS) $(OSICLP_LIBS) $(OSITESTS_LIBS)
     299
     300@COIN_HAS_OSITESTS_TRUE@osiUnitTest_DEPENDENCIES = ../src/libClp.la ../src/OsiClp/libOsiClp.la \
     301@COIN_HAS_OSITESTS_TRUE@  $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
     302
    270303@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
    271304@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src` \
     
    277310#                         unitTest for Clp                             #
    278311########################################################################
    279 unittestflags = $(am__append_2) -unitTest $(am__append_4)
    280 osiunittestflags = $(am__append_3) $(am__append_5)
     312unittestflags = $(am__append_1) -unitTest $(am__append_3)
     313osiunittestflags = $(am__append_2) $(am__append_4)
    281314
    282315########################################################################
  • stable/1.13/Clp/test/osiUnitTest.cpp

    r1559 r1649  
    6969  pathTmp += "Data" ;
    7070  pathTmp += dirsep ;
     71# ifdef COIN_MSVS
     72  // Visual Studio build is deeper
     73  pathTmp = "..\\..\\" + pathTmp ;
     74# endif
    7175
    7276  parms["-mpsDir"] = pathTmp + "Sample"  ;
Note: See TracChangeset for help on using the changeset viewer.