Changeset 1463 for branches


Ignore:
Timestamp:
Jun 7, 2010 6:49:37 AM (9 years ago)
Author:
stefan
Message:

rerun autotools; move some code from OsiConfig?.h to CbcConfig?.h

Location:
branches/split
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Cbc/src/CbcConfig.h

    r1437 r1463  
    9595/* #undef COIN_HAS_XPR */
    9696
     97/*
     98  For additional information about how to set OSICBC_DFLT_SOLVER,
     99  OSICBC_DFLT_SOLVER_CLP, and OSICBC_DFLT_SOLVER_HPP, please see comments at
     100  the beginning of OsiCbcSolverInterface.cpp. Unless you know what you're
     101  doing, you should use clp with OsiCbc. Just uncomment the next three
     102  defines.
     103*/
     104/*
     105  Define to the name of the default solver interface class, e.g.,
     106  OsiClpSolverInterface.
     107*/
     108/* #define OSICBC_DFLT_SOLVER OsiClpSolverInterface */
     109
     110/* Define this symbol if clp is the default solver. */
     111/* #define OSICBC_DFLT_SOLVER_CLP 1 */
     112
     113/*
     114  Define to the name of the .hpp file for the default solver interface class,
     115  e.g., "OsiClpSolverInterface.hpp" (include quotes)
     116*/
     117/* #define OSICBC_DFLT_SOLVER_HPP "OsiClpSolverInterface.hpp" */
     118
    97119#endif /* HAVE_CONFIG_H */
    98120#ifndef CBCVERSION
  • branches/split/configure

    r1446 r1463  
    2103021030  if test -e ../coin_subdirs.txt ; then
    2103121031    for i in `cat ../coin_subdirs.txt` ; do
    21032       COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     21032      if test -d ../$i ; then
     21033        COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     21034      fi
    2103321035    done
    2103421036  fi
     
    2103621038  if test -e ../../coin_subdirs.txt ; then
    2103721039    for i in `cat ../../coin_subdirs.txt` ; do
    21038       COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     21040      if test -d ../../$i ; then
     21041        COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     21042      fi
    2103921043    done
    2104021044  fi
Note: See TracChangeset for help on using the changeset viewer.