Ignore:
Timestamp:
Jun 7, 2010 8:27:42 AM (9 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/src/Makefile.am

    r1455 r1464  
    99AUTOMAKE_OPTIONS = foreign
    1010
     11SUBDIRS = OsiCbc
     12
    1113########################################################################
    1214#                               libCbc                                 #
     
    1517# Name of the library compiled in this directory.  We want it to be installed
    1618# in the 'lib' directory
    17 lib_LTLIBRARIES = libCbc.la libCbcSolver.la
     19coinlibdir = ${libdir}/coin
     20coinlib_LTLIBRARIES = libCbc.la libCbcSolver.la
    1821
    1922# List all source files for this library, including headers
     
    103106        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
    104107
    105 #Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
    106 
    107 ## If we have the Ampl solver library, we need to add additional things
    108 ## also see lower down
    109 ## new idea is to add in source code anyway
    110 ##libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    111 
    112 
    113108# This is for libtool (on Windows)
    114109
     
    119114
    120115bin_PROGRAMS =
    121 AM_CPPFLAGS =
    122 
    123 LIBS += `cat $(CGLOBJDIR)/cgl_addlibs.txt` \
    124         `cat $(OSIOBJDIR)/osi_addlibs.txt` \
    125         `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    126 
     116AM_CPPFLAGS = $(COINDEPEND_CFLAGS)
    127117
    128118########################################################################
     
    137127
    138128# List all source files for this executable, including headers
    139 cbc_SOURCES = \
    140         CoinSolve.cpp
     129cbc_SOURCES = CoinSolve.cpp
    141130
    142131# Additional COIN libraries
    143 cbc_LDADD = libCbcSolver.la \
    144         libCbc.la \
    145         $(CGLOBJDIR)/src/libCgl.la \
    146         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    147         $(OSIOBJDIR)/src/libOsi.la \
    148         $(CLPOBJDIR)/src/libClp.la \
    149         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     132cbc_LDADD = libCbcSolver.la libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
    150133
    151134# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    156139# Add locations of include files.
    157140
    158 AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    159         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    160         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    161 LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     141if COIN_HAS_CLP
     142  AM_CPPFLAGS += $(CLP_CFLAGS)
     143  cbc_LDADD += $(CLP_LIBS)
     144endif
    162145
    163146if COIN_HAS_CPX
    164   AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
    165         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    166   cbc_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    167 endif
    168 
    169 # If we have the Ampl solver library, we need to add additional things
     147  AM_CPPFLAGS += $(CPX_CFLAGS)
     148  cbc_LDADD += $(CPX_LIBS)
     149endif
     150
    170151if COIN_HAS_ASL
    171 #cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    172 cbc_LDADD += $(ASLLIB)
    173 AM_CPPFLAGS += $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
     152  AM_CPPFLAGS += $(ASL_CFLAGS)
     153  cbc_LDADD += $(ASL_LIBS)
    174154endif
    175155
     
    201181        CbcGenSolvers.cpp
    202182
    203 cbc_generic_LDADD = libCbcSolver.la \
    204         libCbc.la \
    205         $(CGLOBJDIR)/src/libCgl.la
     183cbc_generic_LDADD = libCbcSolver.la libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
    206184
    207185# List all additionally required solver and Osi libraries
    208186
    209187if COIN_HAS_CLP
    210   AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    211         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    212         -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    213   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    214         $(CLPOBJDIR)/src/libClp.la
    215   LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     188  AM_CPPFLAGS += $(CLP_CFLAGS)
     189  cbc_generic_LDADD += $(CLP_LIBS)
    216190endif
    217191
    218192if COIN_HAS_CPX
    219   AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
    220         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    221   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     193  AM_CPPFLAGS += $(CPX_CFLAGS)
     194  cbc_generic_LDADD += $(CPX_LIBS)
    222195endif
    223196
    224197if COIN_HAS_DYLP
    225   AM_CPPFLAGS += -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/DylpStdLib` \
    226         -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
    227         -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
    228         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    229   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    230         $(DYLPOBJDIR)/src/Dylp/libDylp.la
    231   LIBS += `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
    232 endif
    233 
    234 if COIN_HAS_FMP
    235   AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    236   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
     198  AM_CPPFLAGS += $(DYLP_CFLAGS)
     199  cbc_generic_LDADD += $(DYLP_LIBS)
    237200endif
    238201
    239202if COIN_HAS_GLPK
    240   AM_CPPFLAGS += -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    241         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    242   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
     203  AM_CPPFLAGS += $(GLPK_CFLAGS)
     204  cbc_generic_LDADD += $(GLPK_LIBS)
    243205endif
    244206
    245207if COIN_HAS_MSK
    246   AM_CPPFLAGS += -I`$(CYGPATH_W) $(MSKINCDIR)` \
    247         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    248   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    249 endif
    250 
    251 if COIN_HAS_OSL
    252   AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
    253         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    254   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    255 endif
    256 
    257 if COIN_HAS_SPX
    258   AM_CPPFLAGS += -I`$(CYGPATH_W) $(SPXINCDIR)` \
    259         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    260   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    261 endif
    262 
    263 if COIN_HAS_SYMPHONY
    264   AM_CPPFLAGS += -I`$(CYGPATH_W) $(SYMPHONYSRCDIR)/src` \
    265         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    266   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    267         $(SYMPHONYOBJDIR)/src/libSym.la
    268   LIBS += `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
    269 endif
     208  AM_CPPFLAGS += $(MSK_CFLAGS)
     209  cbc_generic_LDADD += $(MSK_LIBS)
     210endif
     211
     212# if COIN_HAS_SPX
     213#   AM_CPPFLAGS += $(SPX_CFLAGS)
     214#   cbc_generic_LDADD += $(SPX_LIBS)
     215# endif
    270216
    271217if COIN_HAS_VOL
    272   AM_CPPFLAGS += -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    273         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    274   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    275         $(VOLOBJDIR)/src/libVol.la
    276   LIBS += `cat $(VOLOBJDIR)/vol_addlibs.txt`
     218  AM_CPPFLAGS += $(VOL_CFLAGS)
     219  cbc_generic_LDADD += $(VOL_LIBS)
    277220endif
    278221
    279222if COIN_HAS_XPR
    280   AM_CPPFLAGS += -I`$(CYGPATH_W) $(XPRINCDIR)` \
    281         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    282   cbc_generic_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     223  AM_CPPFLAGS += $(XPR_CFLAGS)
     224  cbc_generic_LDADD += $(XPR_LIBS)
    283225endif
    284226
    285227if COIN_HAS_ASL
    286   cbc_generic_LDADD += $(ASLLIB)
    287   AM_CPPFLAGS += $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
    288 endif
    289 
    290 # Finally the Osi Coin library (many of the above need it)
    291 cbc_generic_LDADD += $(OSIOBJDIR)/src/libOsi.la \
    292         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     228  AM_CPPFLAGS += $(ASL_CFLAGS)
     229  cbc_generic_LDADD += $(ASL_LIBS)
     230endif
    293231
    294232# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    303241#                            Additional flags                          #
    304242########################################################################
    305 
    306 # Here list all include flags, relative to this "srcdir" directory.  This
    307 # "cygpath" stuff is necessary to compile with native compilers on Windows.
    308 # "top_srcdir" refers to the basic directory for the main package that is
    309 # being compiled.
    310 AM_CPPFLAGS += \
    311         -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    312         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    313         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglDuplicateRow` \
    314         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` \
    315         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglGomory` \
    316         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglKnapsackCover` \
    317         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglMixedIntegerRounding` \
    318         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglMixedIntegerRounding2` \
    319         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglOddHole` \
    320         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglPreProcess` \
    321         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglProbing` \
    322         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglRedSplit` \
    323         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglTwomir` \
    324         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglLandP` \
    325         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglResidualCapacity` \
    326         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglZeroHalf` \
    327         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    328         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    329         -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    330         -I`$(CYGPATH_W) $(OSIOBJDIR)/inc`
    331243
    332244# List additional defines
Note: See TracChangeset for help on using the changeset viewer.