Changeset 2352


Ignore:
Timestamp:
Oct 16, 2018 4:08:38 PM (7 months ago)
Author:
stefan
Message:

AMDINCDIR and CHOLMODINCDIR are not longer set

  • and configure takes care of adding the -I flags to CLPLIB_CFLAGS
Location:
branches/autotools-update/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Clp/src/Makefile.am

    r2348 r2352  
    185185AM_CPPFLAGS += -DCOIN_HAS_CLP
    186186
    187 if COIN_HAS_CHOLMOD
    188 AM_CPPFLAGS += -I`$(CYGPATH_W) $(CHOLMODINCDIR)`
    189 endif
    190 
    191 if COIN_HAS_AMD
    192 AM_CPPFLAGS += -I`$(CYGPATH_W) $(AMDINCDIR)`
    193 endif
    194 
    195187# This line is necessary to allow VPATH compilation
    196188# DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
  • branches/autotools-update/Clp/src/Makefile.in

    r2348 r2352  
    162162@COIN_HAS_WSMP_TRUE@am__append_6 = ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.cpp ClpCholeskyWssmpKKT.hpp
    163163bin_PROGRAMS = clp$(EXEEXT)
    164 @COIN_HAS_CHOLMOD_TRUE@am__append_7 = -I`$(CYGPATH_W) $(CHOLMODINCDIR)`
    165 @COIN_HAS_AMD_TRUE@am__append_8 = -I`$(CYGPATH_W) $(AMDINCDIR)`
    166 @COIN_HAS_ABC_TRUE@am__append_9 = AbcSimplex.hpp CoinAbcCommon.hpp AbcCommon.hpp AbcNonLinearCost.hpp
     164@COIN_HAS_ABC_TRUE@am__append_7 = AbcSimplex.hpp CoinAbcCommon.hpp AbcCommon.hpp AbcNonLinearCost.hpp
    167165
    168166# if AMD, CHOLMOD, or GLPK is available, then install ClpCholeskyUfl.hpp (for advanced users)
    169 @COIN_HAS_AMD_TRUE@am__append_10 = ClpCholeskyUfl.hpp
    170 @COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_TRUE@am__append_11 = ClpCholeskyUfl.hpp
    171 @COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__append_12 = ClpCholeskyUfl.hpp
    172 @COIN_HAS_MUMPS_TRUE@am__append_13 = ClpCholeskyMumps.hpp
    173 @COIN_HAS_WSMP_TRUE@am__append_14 = ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.hpp
     167@COIN_HAS_AMD_TRUE@am__append_8 = ClpCholeskyUfl.hpp
     168@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_TRUE@am__append_9 = ClpCholeskyUfl.hpp
     169@COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__append_10 = ClpCholeskyUfl.hpp
     170@COIN_HAS_MUMPS_TRUE@am__append_11 = ClpCholeskyMumps.hpp
     171@COIN_HAS_WSMP_TRUE@am__append_12 = ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.hpp
    174172subdir = src
    175173ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    597595# CbcOrClpParam seem to require COIN_HAS_CLP so that it knows that it
    598596# is built within Clp
    599 AM_CPPFLAGS = $(CLPLIB_CFLAGS) -DCLP_BUILD -DCOIN_HAS_CLP \
    600         $(am__append_7) $(am__append_8)
     597AM_CPPFLAGS = $(CLPLIB_CFLAGS) -DCLP_BUILD -DCOIN_HAS_CLP
    601598
    602599# Name of the library compiled in this directory.  We want it to be installed
     
    701698        ClpPEPrimalColumnDantzig.hpp ClpPEPrimalColumnSteepest.hpp \
    702699        ClpPEDualRowDantzig.hpp ClpPEDualRowSteepest.hpp \
    703         $(am__append_9) $(am__append_10) $(am__append_11) \
    704         $(am__append_12) $(am__append_13) $(am__append_14) \
     700        $(am__append_7) $(am__append_8) $(am__append_9) \
     701        $(am__append_10) $(am__append_11) $(am__append_12) \
    705702        CbcOrClpParam.cpp
    706703all: config.h config_clp.h
Note: See TracChangeset for help on using the changeset viewer.