1.1 --- a/cmake/FindCOIN.cmake	Wed Apr 29 17:48:18 2009 +0100
     1.2 +++ b/cmake/FindCOIN.cmake	Wed Apr 29 17:48:41 2009 +0100
     1.3 @@ -1,28 +1,48 @@
     1.4  SET(COIN_ROOT_DIR "" CACHE PATH "COIN root directory")
     1.5  
     1.6  FIND_PATH(COIN_INCLUDE_DIR coin/CoinUtilsConfig.h
     1.7 -  PATHS ${COIN_ROOT_DIR}/include)
     1.8 -
     1.9 -FIND_LIBRARY(COIN_CBC_LIBRARY libCbc
    1.10 -  PATHS ${COIN_ROOT_DIR}/lib)
    1.11 -FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY libCbcSolver
    1.12 -  PATHS ${COIN_ROOT_DIR}/lib)
    1.13 -FIND_LIBRARY(COIN_CGL_LIBRARY libCgl
    1.14 -  PATHS ${COIN_ROOT_DIR}/lib)
    1.15 -FIND_LIBRARY(COIN_CLP_LIBRARY libClp
    1.16 -  PATHS ${COIN_ROOT_DIR}/lib)
    1.17 -FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY libCoinUtils
    1.18 -  PATHS ${COIN_ROOT_DIR}/lib)
    1.19 -FIND_LIBRARY(COIN_OSI_LIBRARY libOsi
    1.20 -  PATHS ${COIN_ROOT_DIR}/lib)
    1.21 -FIND_LIBRARY(COIN_OSI_CBC_LIBRARY libOsiCbc
    1.22 -  PATHS ${COIN_ROOT_DIR}/lib)
    1.23 -FIND_LIBRARY(COIN_OSI_CLP_LIBRARY libOsiClp
    1.24 -  PATHS ${COIN_ROOT_DIR}/lib)
    1.25 -FIND_LIBRARY(COIN_OSI_VOL_LIBRARY libOsiVol
    1.26 -  PATHS ${COIN_ROOT_DIR}/lib)
    1.27 -FIND_LIBRARY(COIN_VOL_LIBRARY libVol
    1.28 -  PATHS ${COIN_ROOT_DIR}/lib)
    1.29 +  HINTS ${COIN_ROOT_DIR}/include
    1.30 +)
    1.31 +FIND_LIBRARY(COIN_CBC_LIBRARY
    1.32 +  NAMES Cbc libCbc
    1.33 +  HINTS ${COIN_ROOT_DIR}/lib
    1.34 +)
    1.35 +FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY
    1.36 +  NAMES CbcSolver libCbcSolver
    1.37 +  HINTS ${COIN_ROOT_DIR}/lib
    1.38 +)
    1.39 +FIND_LIBRARY(COIN_CGL_LIBRARY
    1.40 +  NAMES Cgl libCgl
    1.41 +  HINTS ${COIN_ROOT_DIR}/lib
    1.42 +)
    1.43 +FIND_LIBRARY(COIN_CLP_LIBRARY
    1.44 +  NAMES Clp libClp
    1.45 +  HINTS ${COIN_ROOT_DIR}/lib
    1.46 +)
    1.47 +FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY
    1.48 +  NAMES CoinUtils libCoinUtils
    1.49 +  HINTS ${COIN_ROOT_DIR}/lib
    1.50 +)
    1.51 +FIND_LIBRARY(COIN_OSI_LIBRARY
    1.52 +  NAMES Osi libOsi
    1.53 +  HINTS ${COIN_ROOT_DIR}/lib
    1.54 +)
    1.55 +FIND_LIBRARY(COIN_OSI_CBC_LIBRARY
    1.56 +  NAMES OsiCbc libOsiCbc
    1.57 +  HINTS ${COIN_ROOT_DIR}/lib
    1.58 +)
    1.59 +FIND_LIBRARY(COIN_OSI_CLP_LIBRARY
    1.60 +  NAMES OsiClp libOsiClp
    1.61 +  HINTS ${COIN_ROOT_DIR}/lib
    1.62 +)
    1.63 +FIND_LIBRARY(COIN_OSI_VOL_LIBRARY
    1.64 +  NAMES OsiVol libOsiVol
    1.65 +  HINTS ${COIN_ROOT_DIR}/lib
    1.66 +)
    1.67 +FIND_LIBRARY(COIN_VOL_LIBRARY
    1.68 +  NAMES Vol libVol
    1.69 +  HINTS ${COIN_ROOT_DIR}/lib
    1.70 +)
    1.71  
    1.72  INCLUDE(FindPackageHandleStandardArgs)
    1.73  FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG
    1.74 @@ -61,8 +81,8 @@
    1.75  )
    1.76  
    1.77  IF(COIN_FOUND)
    1.78 -  SET(HAVE_LP TRUE)
    1.79 -  SET(HAVE_MIP TRUE)
    1.80 -  SET(HAVE_CLP TRUE)
    1.81 -  SET(HAVE_CBC TRUE)
    1.82 +  SET(LEMON_HAVE_LP TRUE)
    1.83 +  SET(LEMON_HAVE_MIP TRUE)
    1.84 +  SET(LEMON_HAVE_CLP TRUE)
    1.85 +  SET(LEMON_HAVE_CBC TRUE)
    1.86  ENDIF(COIN_FOUND)