Ignore:
Timestamp:
Jan 26, 2013 9:00:13 PM (7 years ago)
Author:
stefan
Message:
  • add configure option --enable-aboca={1,2,3,4,yes,no}
  • compile Aboca source only if --enable-aboca set (instead of compiling empty source files)
  • fix svn properties
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        77Data/Netlib       https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
        88Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        9 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         9CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         10Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
  • trunk/Clp/src/Makefile.am

    r1878 r1910  
    6969        ClpSimplexPrimal.cpp ClpSimplexPrimal.hpp \
    7070        ClpSolve.cpp ClpSolve.hpp \
     71        Idiot.cpp Idiot.hpp \
     72        IdiSolve.cpp
     73
     74if COIN_HAS_ABC
     75libClp_la_SOURCES += \
     76        AbcCommon.hpp \
     77        AbcDualRowDantzig.cpp AbcDualRowDantzig.hpp \
     78        AbcDualRowPivot.cpp AbcDualRowPivot.hpp \
     79        AbcDualRowSteepest.cpp AbcDualRowSteepest.hpp \
     80        AbcMatrix.cpp AbcMatrix.hpp \
     81        AbcNonLinearCost.cpp AbcNonLinearCost.hpp \
     82        AbcPrimalColumnDantzig.cpp AbcPrimalColumnDantzig.hpp \
     83        AbcPrimalColumnPivot.cpp AbcPrimalColumnPivot.hpp \
     84        AbcPrimalColumnSteepest.cpp AbcPrimalColumnSteepest.hpp \
     85        AbcSimplex.cpp AbcSimplex.hpp \
     86        AbcSimplexDual.cpp AbcSimplexDual.hpp \
     87        AbcSimplexPrimal.cpp AbcSimplexPrimal.hpp \
     88        AbcSimplexParallel.cpp \
     89        AbcSimplexFactorization.cpp AbcSimplexFactorization.hpp \
    7190        AbcWarmStart.cpp AbcWarmStart.hpp \
    7291        CoinAbcBaseFactorization.hpp \
    73         CoinAbcCommonFactorization.hpp \
    74         CoinAbcCommon.hpp \
    75         AbcDualRowDantzig.hpp \
    76         AbcDualRowPivot.hpp \
    77         AbcDualRowSteepest.hpp \
    78         CoinAbcFactorization.hpp \
    79         CoinAbcHelperFunctions.hpp \
    80         AbcMatrix.hpp \
    81         AbcCommon.hpp \
    82         AbcSimplexDual.hpp \
    83         AbcSimplexPrimal.hpp \
    84         AbcSimplex.hpp \
    8592        CoinAbcBaseFactorization1.cpp \
    8693        CoinAbcBaseFactorization2.cpp \
     
    8895        CoinAbcBaseFactorization4.cpp \
    8996        CoinAbcBaseFactorization5.cpp \
     97        CoinAbcCommonFactorization.hpp \
     98        CoinAbcCommon.hpp \
    9099        CoinAbcDenseFactorization.cpp \
    91100        CoinAbcDenseFactorization.hpp \
    92         AbcDualRowDantzig.cpp \
    93         AbcDualRowPivot.cpp \
    94         AbcDualRowSteepest.cpp \
     101        CoinAbcFactorization.hpp \
    95102        CoinAbcFactorization1.cpp \
    96103        CoinAbcFactorization2.cpp \
     
    98105        CoinAbcFactorization4.cpp \
    99106        CoinAbcFactorization5.cpp \
    100         CoinAbcHelperFunctions.cpp \
    101         AbcMatrix.cpp \
    102         AbcSimplex.cpp \
    103         AbcSimplexDual.cpp \
    104         AbcSimplexPrimal.cpp \
    105         AbcSimplexParallel.cpp \
    106         AbcPrimalColumnDantzig.cpp AbcPrimalColumnDantzig.hpp \
    107         AbcPrimalColumnPivot.cpp AbcPrimalColumnPivot.hpp \
    108         AbcPrimalColumnSteepest.cpp AbcPrimalColumnSteepest.hpp \
    109         CoinAbcSmallFactorization1.cpp \
    110         CoinAbcSmallFactorization2.cpp \
    111         CoinAbcSmallFactorization3.cpp \
    112         CoinAbcSmallFactorization4.cpp \
    113         CoinAbcSmallFactorization5.cpp \
     107        CoinAbcHelperFunctions.cpp CoinAbcHelperFunctions.hpp \
    114108        CoinAbcOrderedFactorization1.cpp \
    115109        CoinAbcOrderedFactorization2.cpp \
     
    117111        CoinAbcOrderedFactorization4.cpp \
    118112        CoinAbcOrderedFactorization5.cpp \
    119         AbcSimplexFactorization.cpp \
    120         AbcSimplexFactorization.hpp \
    121         AbcNonLinearCost.cpp AbcNonLinearCost.hpp \
    122         Idiot.cpp Idiot.hpp \
    123         IdiSolve.cpp
     113        CoinAbcSmallFactorization1.cpp \
     114        CoinAbcSmallFactorization2.cpp \
     115        CoinAbcSmallFactorization3.cpp \
     116        CoinAbcSmallFactorization4.cpp \
     117        CoinAbcSmallFactorization5.cpp
     118endif
    124119
    125120# if AMD, CHOLMOD, or GLPK is available, then compile ClpCholeskyUfl.cpp
     
    236231        ClpSolve.hpp \
    237232        CbcOrClpParam.hpp \
    238         AbcSimplex.hpp CoinAbcCommon.hpp AbcCommon.hpp \
    239233        Idiot.hpp
     234
     235if COIN_HAS_ABC
     236includecoin_HEADERS += AbcSimplex.hpp CoinAbcCommon.hpp AbcCommon.hpp
     237endif
    240238
    241239
Note: See TracChangeset for help on using the changeset viewer.