Changeset 1740


Ignore:
Timestamp:
Nov 25, 2010 6:14:17 PM (9 years ago)
Author:
stefan
Message:

get unittest compiling again

Location:
branches/split/Bonmin/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Bonmin/test/Makefile.am

    r1055 r1740  
    2929unitTest_LDADD += \
    3030        ../src/CbcBonmin/libbonminampl.la \
    31         $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
     31        $(ASL_LIBS)
    3232endif
    3333unitTest_LDADD += \
    3434        ../src/CbcBonmin/libbonmin.la \
    35         $(IPOPTLIBS) \
    36         $(COINLIBS) \
    37         $(ASLLIB) \
    38         $(ADDLIBS)
     35        $(BONMINLIB_LIBS)
    3936
    4037
     
    4845CppExample_LDADD = \
    4946        ../src/CbcBonmin/libbonmin.la \
    50         $(IPOPTLIBS) \
    51         $(COINLIBS)
    52 
    53 CppExample_LDADD += $(ADDLIBS)
    54 
    55 COINLIBS = \
    56         $(CBCOBJDIR)/src/libCbc.la \
    57         $(CGLOBJDIR)/src/libCgl.la \
    58         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    59         $(OSIOBJDIR)/src/libOsi.la \
    60         $(CLPOBJDIR)/src/libClp.la \
    61         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    62 
    63 if COIN_HAS_CPX
    64   COINLIBS += \
    65         $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la \
    66         $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    67         $(CPXLIB)
    68 endif
    69 
    70 IPOPTLIBS = \
    71         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
    72 
    73 # List additional libraries
    74 LIBS += `cat $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt`
     47        $(BONMINLIB_LIBS)
    7548
    7649# Here list all include flags, relative to this "srcdir" directory.  This
    7750# "cygpath" stuff is necessary to compile with native compilers on Cygwin
    78 AM_CPPFLAGS = \
     51AM_CPPFLAGS = $(BONMINLIB_CFLAGS) $(ASL_CFLAGS) \
    7952        -I`$(CYGPATH_W) $(srcdir)/../src/Apps` \
    8053        -I`$(CYGPATH_W) $(srcdir)/../src/Interfaces` \
     
    8659        -I`$(CYGPATH_W) $(srcdir)/../src/Algorithms/Branching` \
    8760        -I`$(CYGPATH_W) $(srcdir)/../src/Algorithms/OaGenerators` \
    88         -I`$(CYGPATH_W) $(srcdir)/../src/Algorithms/Ampl` \
    89         -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
    90         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/contrib/CGPenalty` \
    91         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    92         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` \
    93         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/LinAlg` \
    94         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    95         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    96         -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    97         -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    98         -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    99         -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    100         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    101         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    102         -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    103           $(ASL_CPPFLAGS)
    104 
     61        -I`$(CYGPATH_W) $(srcdir)/../src/Algorithms/Ampl`
    10562
    10663# This line is necessary to allow VPATH compilation with MS compilers
  • branches/split/Bonmin/test/Makefile.in

    r1733 r1740  
    4747@COIN_HAS_ASL_TRUE@am__append_2 = \
    4848@COIN_HAS_ASL_TRUE@        ../src/CbcBonmin/libbonminampl.la \
    49 @COIN_HAS_ASL_TRUE@     $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
    50 
    51 @COIN_HAS_CPX_TRUE@am__append_3 = \
    52 @COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la \
    53 @COIN_HAS_CPX_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    54 @COIN_HAS_CPX_TRUE@     $(CPXLIB)
     49@COIN_HAS_ASL_TRUE@     $(ASL_LIBS)
    5550
    5651subdir = test
     
    6863am_CppExample_OBJECTS = MyBonmin.$(OBJEXT) MyTMINLP.$(OBJEXT)
    6964CppExample_OBJECTS = $(am_CppExample_OBJECTS)
    70 am__DEPENDENCIES_1 = $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
    71 am__DEPENDENCIES_2 =
    72 @COIN_HAS_CPX_TRUE@am__DEPENDENCIES_3 =  \
    73 @COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la \
    74 @COIN_HAS_CPX_TRUE@     $(COINUTILSOBJDIR)/src/libCoinUtils.la \
    75 @COIN_HAS_CPX_TRUE@     $(am__DEPENDENCIES_2)
    76 am__DEPENDENCIES_4 = $(CBCOBJDIR)/src/libCbc.la \
    77         $(CGLOBJDIR)/src/libCgl.la \
    78         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    79         $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    80         $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__DEPENDENCIES_3)
     65am__DEPENDENCIES_1 =
    8166CppExample_DEPENDENCIES = ../src/CbcBonmin/libbonmin.la \
    82         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
    83         $(am__DEPENDENCIES_2)
     67        $(am__DEPENDENCIES_1)
    8468am_unitTest_OBJECTS = InterfaceTest.$(OBJEXT)
    8569unitTest_OBJECTS = $(am_unitTest_OBJECTS)
    86 @COIN_HAS_ASL_TRUE@am__DEPENDENCIES_5 =  \
     70@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_2 =  \
    8771@COIN_HAS_ASL_TRUE@     ../src/CbcBonmin/libbonminampl.la \
    88 @COIN_HAS_ASL_TRUE@     $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
    89 unitTest_DEPENDENCIES = $(am__DEPENDENCIES_5) \
    90         ../src/CbcBonmin/libbonmin.la $(am__DEPENDENCIES_1) \
    91         $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_2)
     72@COIN_HAS_ASL_TRUE@     $(am__DEPENDENCIES_1)
     73unitTest_DEPENDENCIES = $(am__DEPENDENCIES_2) \
     74        ../src/CbcBonmin/libbonmin.la $(am__DEPENDENCIES_1)
    9275depcomp = $(SHELL) $(top_srcdir)/../depcomp
    9376am__depfiles_maybe = depfiles
     
    208191LIBEXT = @LIBEXT@
    209192LIBOBJS = @LIBOBJS@
    210 
    211 # List additional libraries
    212 LIBS = @LIBS@ `cat \
    213         $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt`
     193LIBS = @LIBS@
    214194LIBTOOL = @LIBTOOL@
    215195LIBTOOLM4 = @LIBTOOLM4@
     
    309289# List libraries of COIN projects; libs with AMPL interface have to come before ASLLIB
    310290unitTest_LDADD = $(am__append_2) ../src/CbcBonmin/libbonmin.la \
    311         $(IPOPTLIBS) $(COINLIBS) $(ASLLIB) $(ADDLIBS)
     291        $(BONMINLIB_LIBS)
    312292
    313293#########################################################################
     
    316296
    317297# List libraries of COIN projects
    318 CppExample_LDADD = ../src/CbcBonmin/libbonmin.la $(IPOPTLIBS) \
    319         $(COINLIBS) $(ADDLIBS)
    320 COINLIBS = $(CBCOBJDIR)/src/libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    321         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    322         $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    323         $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__append_3)
    324 IPOPTLIBS = \
    325         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
     298CppExample_LDADD = \
     299        ../src/CbcBonmin/libbonmin.la \
     300        $(BONMINLIB_LIBS)
    326301
    327302
    328303# Here list all include flags, relative to this "srcdir" directory.  This
    329304# "cygpath" stuff is necessary to compile with native compilers on Cygwin
    330 AM_CPPFLAGS = \
     305AM_CPPFLAGS = $(BONMINLIB_CFLAGS) $(ASL_CFLAGS) \
    331306        -I`$(CYGPATH_W) $(srcdir)/../src/Apps` \
    332307        -I`$(CYGPATH_W) $(srcdir)/../src/Interfaces` \
     
    338313        -I`$(CYGPATH_W) $(srcdir)/../src/Algorithms/Branching` \
    339314        -I`$(CYGPATH_W) $(srcdir)/../src/Algorithms/OaGenerators` \
    340         -I`$(CYGPATH_W) $(srcdir)/../src/Algorithms/Ampl` \
    341         -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
    342         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/contrib/CGPenalty` \
    343         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    344         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` \
    345         -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/LinAlg` \
    346         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    347         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    348         -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    349         -I`$(CYGPATH_W) $(CBCOBJDIR)/inc` \
    350         -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    351         -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    352         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    353         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    354         -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    355           $(ASL_CPPFLAGS)
     315        -I`$(CYGPATH_W) $(srcdir)/../src/Algorithms/Ampl`
    356316
    357317
Note: See TracChangeset for help on using the changeset viewer.