Ignore:
Timestamp:
Jun 26, 2007 5:17:15 AM (12 years ago)
Author:
forrest
Message:

trunk from branches/devel

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 MSVisualStudio   https://projects.coin-or.org/svn/MSVisualStudio/trunk/ExternalsDirs/Cbc
        2 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.5
         1MSVisualStudio   https://projects.coin-or.org/svn/MSVisualStudio/branches/devel/ExternalsDirs/Cbc
         2BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
        33ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
         4ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
         5ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        46Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        57Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
  • trunk/Cbc/src/Makefile.am

    r454 r640  
    3838        CbcHeuristicGreedy.cpp CbcHeuristicGreedy.hpp \
    3939        CbcHeuristicLocal.cpp CbcHeuristicLocal.hpp \
     40        CbcHeuristicRINS.cpp CbcHeuristicRINS.hpp \
    4041        CbcMessage.cpp CbcMessage.hpp \
    4142        CbcModel.cpp CbcModel.hpp \
    4243        CbcNode.cpp CbcNode.hpp \
     44        CbcSolver.cpp CbcCbcParam.cpp \
    4345        CbcStatistics.cpp CbcStatistics.hpp \
    4446        CbcStrategy.cpp CbcStrategy.hpp \
    4547        CbcTree.cpp CbcTree.hpp \
    46         CbcTreeLocal.cpp CbcTreeLocal.hpp
     48        CbcLinked.cpp CbcLinked.hpp \
     49        CbcTreeLocal.cpp CbcTreeLocal.hpp
     50
     51## If we have the Ampl solver library, we need to add additional things
     52## also see lower down
     53## new idea is to add in source code anyway
     54libCbc_la_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
     55
    4756
    4857# This is for libtool (on Windows)
     58
    4959libCbc_la_LDFLAGS = $(LT_LDFLAGS)
    5060
    51 ########################################################################
    52 #                        cbc-generic program                           #
    53 ########################################################################
     61# Some common setup for cbc and cbc-generic.
     62
     63bin_PROGRAMS =
     64AM_CPPFLAGS =
     65
     66LIBS += `cat $(CGLOBJDIR)/cgl_addlibs.txt` \
     67        `cat $(OSIOBJDIR)/osi_addlibs.txt` \
     68        `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
     69
     70
     71########################################################################
     72#                            cbc program                               #
     73########################################################################
     74
     75if COIN_HAS_CLP
    5476
    5577# Name of the executable compiled in this directory.  We want it to be
    5678# installed in the 'bin' directory
    57 bin_PROGRAMS = cbc-generic
     79bin_PROGRAMS += cbc
    5880
    5981# List all source files for this executable, including headers
     82cbc_SOURCES = \
     83        CoinSolve.cpp \
     84        unitTestClp.cpp
     85
     86# Additional COIN libraries
     87cbc_LDADD = libCbc.la \
     88        $(CGLOBJDIR)/src/libCgl.la \
     89        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     90        $(OSIOBJDIR)/src/libOsi.la \
     91        $(CLPOBJDIR)/src/libClp.la \
     92        $(COINUTILSOBJDIR)/src/libCoinUtils.la
     93
     94# Finally, the -rpath flag is used by libtool to make sure that the shared
     95# library is found (in the lib install directory) when we are using dynamic
     96# libraries.
     97cbc_LDFLAGS = -rpath $(libdir)
     98
     99# Add locations of include files.
     100
     101AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     102        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
     103        -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
     104LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     105
     106# If we have the Ampl solver library, we need to add additional things
     107if COIN_HAS_ASL
     108#cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
     109cbc_LDADD += $(ASLLIB)
     110AM_CPPFLAGS += $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
     111endif
     112
     113endif
     114
     115
     116########################################################################
     117#                        cbc-generic program                           #
     118########################################################################
     119
     120if CBC_BUILD_CBC_GENERIC
     121
     122# Name of the executable compiled in this directory.  We want it to be
     123# installed in the 'bin' directory
     124
     125bin_PROGRAMS += cbc-generic
     126
     127# List all source files for this executable, including headers
     128
    60129cbc_generic_SOURCES = \
    61         CbcMain.cpp \
    62         CbcParam.cpp CbcParam.hpp \
    63         unitTest.cpp
    64 
    65 # The following file is not to be distributed, since it is "borrowed" from Clp
    66 nodist_cbc_generic_SOURCES = CbcOrClpParam.cpp
     130        CbcGenBaB.cpp \
     131        CbcGenCbcParam.cpp CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp \
     132        CbcGenCtlBlk.cpp CbcGenCtlBlk.hpp \
     133        CbcGeneric.cpp \
     134        CbcGenMessages.cpp CbcGenMessages.hpp \
     135        CbcGenOsiParam.cpp CbcGenOsiParam.hpp CbcGenOsiParamUtils.cpp \
     136        CbcGenParam.cpp CbcGenParam.hpp CbcGenParamUtils.cpp \
     137        CbcGenSolution.cpp \
     138        CbcGenSolvers.cpp
    67139
    68140cbc_generic_LDADD = libCbc.la \
    69         $(CGLOBJDIR)/src/libCgl.la \
    70         $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la
    71 AM_CPPFLAGS = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
     141        $(CGLOBJDIR)/src/libCgl.la
    72142
    73143# List all additionally required solver and Osi libraries
     144
    74145if COIN_HAS_CLP
    75146  AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     
    151222cbc_generic_LDADD += $(OSIOBJDIR)/src/libOsi.la \
    152223        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    153 LIBS += `cat $(OSIOBJDIR)/osi_addlibs.txt` \
    154         `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    155224
    156225# Finally, the -rpath flag is used by libtool to make sure that the shared
    157226# library is found (in the lib install directory) when we are using dynamic
    158227# libraries.
     228
    159229cbc_generic_LDFLAGS = -rpath $(libdir)
    160 
    161 ########################################################################
    162 #                            cbc program                               #
    163 ########################################################################
    164 
    165 if COIN_HAS_CLP
    166 
    167 # Name of the executable compiled in this directory.  We want it to be
    168 # installed in the 'bin' directory
    169 bin_PROGRAMS += cbc
    170 
    171 # List all source files for this executable, including headers
    172 cbc_SOURCES = \
    173         CoinSolve.cpp \
    174         unitTestClp.cpp
    175 
    176 # The following file is not to be distributed, since it is "borrowed" from Clp
    177 nodist_cbc_SOURCES = CbcOrClpParam.cpp
    178 
    179 # Additional COIN libraries
    180 cbc_LDADD = libCbc.la \
    181         $(CGLOBJDIR)/src/libCgl.la \
    182         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    183         $(OSIOBJDIR)/src/libOsi.la \
    184         $(CLPOBJDIR)/src/libClp.la \
    185         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    186 
    187 # Finally, the -rpath flag is used by libtool to make sure that the shared
    188 # library is found (in the lib install directory) when we are using dynamic
    189 # libraries.
    190 cbc_LDFLAGS = -rpath $(libdir)
    191 
    192 # If we have the Ampl solver library, we need to add additional things
    193 if COIN_HAS_ASL
    194 cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    195 cbc_LDADD += $(ASLLIB)
    196 AM_CPPFLAGS += $(ASL_CPPFLAGS)
    197 endif
    198230
    199231endif
     
    221253        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglRedSplit` \
    222254        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglTwomir` \
     255        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglLandP` \
     256        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglResidualCapacity` \
    223257        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    224258        -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
     
    251285        CbcCutGenerator.hpp \
    252286        CbcEventHandler.hpp \
     287        CbcFeasibilityBase.hpp \
    253288        CbcHeuristic.hpp \
    254289        CbcHeuristicFPump.hpp \
    255290        CbcHeuristicGreedy.hpp \
    256291        CbcHeuristicLocal.hpp \
     292        CbcHeuristicRINS.hpp \
    257293        CbcMessage.hpp \
    258294        CbcModel.hpp \
     
    260296        CbcStrategy.hpp \
    261297        CbcTree.hpp \
    262         CbcTreeLocal.hpp
     298        CbcLinked.hpp \
     299        CbcTreeLocal.hpp
    263300
    264301#############################################################################
Note: See TracChangeset for help on using the changeset viewer.