Changeset 1701 for trunk


Ignore:
Timestamp:
Mar 9, 2011 5:56:48 AM (9 years ago)
Author:
stefan
Message:

install ClpCholeskyXyz?.hpp for advanced users

Location:
trunk/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/Makefile.am

    r1693 r1701  
    154154        ClpCholeskyBase.hpp \
    155155        ClpCholeskyDense.hpp \
    156         ClpCholeskyWssmp.hpp \
    157156        ClpConstraint.hpp \
    158157        ClpConstraintLinear.hpp \
     
    194193        Idiot.hpp
    195194
     195
     196# if AMD, CHOLMOD, or GLPK is available, then install ClpCholeskyUfl.hpp (for advanced users)
     197if COIN_HAS_AMD
     198includecoin_HEADERS += ClpCholeskyUfl.hpp
     199else
     200if COIN_HAS_CHOLMOD
     201includecoin_HEADERS += ClpCholeskyUfl.hpp
     202else
     203if COIN_HAS_GLPK
     204includecoin_HEADERS += ClpCholeskyUfl.hpp
     205endif
     206endif
     207endif
     208
     209if COIN_HAS_MUMPS
     210includecoin_HEADERS += ClpCholeskyMumps.hpp
     211endif
     212
     213if COIN_HAS_WSMP
     214includecoin_HEADERS += ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.hpp
     215endif
     216
    196217# needed by Cbc
    197218includecoin_HEADERS += CbcOrClpParam.cpp
  • trunk/Clp/src/Makefile.in

    r1695 r1701  
    5555@COIN_HAS_CHOLMOD_TRUE@am__append_6 = -I`$(CYGPATH_W) $(CHOLMODINCDIR)`
    5656@COIN_HAS_AMD_TRUE@am__append_7 = -I`$(CYGPATH_W) $(AMDINCDIR)`
     57
     58# if AMD, CHOLMOD, or GLPK is available, then install ClpCholeskyUfl.hpp (for advanced users)
     59@COIN_HAS_AMD_TRUE@am__append_8 = ClpCholeskyUfl.hpp
     60@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_TRUE@am__append_9 = ClpCholeskyUfl.hpp
     61@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__append_10 = ClpCholeskyUfl.hpp
     62@COIN_HAS_MUMPS_TRUE@am__append_11 = ClpCholeskyMumps.hpp
     63@COIN_HAS_WSMP_TRUE@am__append_12 = ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.hpp
    5764subdir = src
    58 DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
     65DIST_COMMON = $(am__includecoin_HEADERS_DIST) $(srcdir)/Makefile.am \
    5966        $(srcdir)/Makefile.in
    6067ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    174181        pdf-recursive ps-recursive uninstall-info-recursive \
    175182        uninstall-recursive
     183am__includecoin_HEADERS_DIST = ../inc/config_clp.h Clp_C_Interface.h \
     184        ClpCholeskyBase.hpp ClpCholeskyDense.hpp ClpConstraint.hpp \
     185        ClpConstraintLinear.hpp ClpConstraintQuadratic.hpp \
     186        ClpDualRowDantzig.hpp ClpDualRowPivot.hpp \
     187        ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
     188        ClpDynamicExampleMatrix.hpp ClpDynamicMatrix.hpp \
     189        ClpEventHandler.hpp ClpFactorization.hpp \
     190        ClpGubDynamicMatrix.hpp ClpGubMatrix.hpp ClpInterior.hpp \
     191        ClpLinearObjective.hpp ClpMatrixBase.hpp ClpMessage.hpp \
     192        ClpModel.hpp ClpNetworkMatrix.hpp ClpNonLinearCost.hpp \
     193        ClpNode.hpp ClpObjective.hpp ClpPackedMatrix.hpp \
     194        ClpPdcoBase.hpp ClpPlusMinusOneMatrix.hpp ClpParameters.hpp \
     195        ClpPresolve.hpp ClpPrimalColumnDantzig.hpp \
     196        ClpPrimalColumnPivot.hpp ClpPrimalColumnSteepest.hpp \
     197        ClpQuadraticObjective.hpp ClpSimplex.hpp \
     198        ClpSimplexNonlinear.hpp ClpSimplexOther.hpp \
     199        ClpSimplexPrimal.hpp ClpSolve.hpp CbcOrClpParam.hpp Idiot.hpp \
     200        ClpCholeskyUfl.hpp ClpCholeskyMumps.hpp ClpCholeskyWssmp.hpp \
     201        ClpCholeskyWssmpKKT.hpp CbcOrClpParam.cpp
    176202includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    177203HEADERS = $(includecoin_HEADERS)
     
    524550# needed by Cbc
    525551includecoin_HEADERS = ../inc/config_clp.h Clp_C_Interface.h \
    526         ClpCholeskyBase.hpp ClpCholeskyDense.hpp ClpCholeskyWssmp.hpp \
    527         ClpConstraint.hpp ClpConstraintLinear.hpp \
    528         ClpConstraintQuadratic.hpp ClpDualRowDantzig.hpp \
    529         ClpDualRowPivot.hpp ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
     552        ClpCholeskyBase.hpp ClpCholeskyDense.hpp ClpConstraint.hpp \
     553        ClpConstraintLinear.hpp ClpConstraintQuadratic.hpp \
     554        ClpDualRowDantzig.hpp ClpDualRowPivot.hpp \
     555        ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
    530556        ClpDynamicExampleMatrix.hpp ClpDynamicMatrix.hpp \
    531557        ClpEventHandler.hpp ClpFactorization.hpp \
     
    540566        ClpSimplexNonlinear.hpp ClpSimplexOther.hpp \
    541567        ClpSimplexPrimal.hpp ClpSolve.hpp CbcOrClpParam.hpp Idiot.hpp \
    542         CbcOrClpParam.cpp
     568        $(am__append_8) $(am__append_9) $(am__append_10) \
     569        $(am__append_11) $(am__append_12) CbcOrClpParam.cpp
    543570
    544571#############################################################################
Note: See TracChangeset for help on using the changeset viewer.