Ignore:
Timestamp:
Mar 5, 2011 12:06:15 PM (9 years ago)
Author:
stefan
Message:

check for AMD and CHOLMOD and GLPK's AMD in configure; compile ClpCholeskyUfl? only if AMD, CHOLMOD, or GLPK available

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
        2 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
        3 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
        4 Data/Netlib  https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
        5 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        6 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        7 Osi  https://projects.coin-or.org/svn/Osi/trunk/Osi
        8 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
         4ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         5ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         6ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         7Data/Netlib   https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
         8Data/Sample   https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         9CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         10Osi           https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
  • trunk/Clp/src/Makefile.am

    r1659 r1691  
    2626        ClpCholeskyBase.cpp ClpCholeskyBase.hpp \
    2727        ClpCholeskyDense.cpp ClpCholeskyDense.hpp \
    28         ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp \
    2928        ClpCholeskyMumps.cpp ClpCholeskyMumps.hpp \
    3029        ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp \
     
    7675        IdiSolve.cpp
    7776
     77# if AMD, CHOLMOD, or GLPK is available, then compile ClpCholeskyUfl.cpp
     78if COIN_HAS_AMD
     79libClp_la_SOURCES += ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
     80else
     81if COIN_HAS_CHOLMOD
     82libClp_la_SOURCES += ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
     83else
     84if COIN_HAS_GLPK
     85libClp_la_SOURCES += ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp
     86endif
     87endif
     88endif
     89
    7890# This is for libtool
    7991libClp_la_LDFLAGS = $(LT_LDFLAGS)
     
    111123
    112124# CbcOrClpParam seem to require COIN_HAS_CLP so that it knows that it is build within Clp
    113 AM_CPPFLAGS = $(COINUTILS_CFLAGS) -DCOIN_HAS_CLP
     125AM_CPPFLAGS = $(CLPLIB_CFLAGS) -DCOIN_HAS_CLP
     126
     127if COIN_HAS_CHOLMOD
     128AM_CPPFLAGS += -I`$(CYGPATH_W) $(CHOLMODINCDIR)`
     129endif
     130
     131if COIN_HAS_AMD
     132AM_CPPFLAGS += -I`$(CYGPATH_W) $(AMDINCDIR)`
     133endif
    114134
    115135# This line is necessary to allow VPATH compilation with MS compilers
Note: See TracChangeset for help on using the changeset viewer.