diff -r 4f9e5801224e -r f9e3f73e17f1 cmake/FindCOIN.cmake --- a/cmake/FindCOIN.cmake Tue Apr 26 17:25:00 2011 +0200 +++ b/cmake/FindCOIN.cmake Wed Jul 13 15:04:03 2011 +0200 @@ -5,42 +5,52 @@ ) FIND_LIBRARY(COIN_CBC_LIBRARY NAMES Cbc libCbc + HINTS ${COIN_ROOT_DIR}/lib/coin HINTS ${COIN_ROOT_DIR}/lib ) FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY NAMES CbcSolver libCbcSolver + HINTS ${COIN_ROOT_DIR}/lib/coin HINTS ${COIN_ROOT_DIR}/lib ) FIND_LIBRARY(COIN_CGL_LIBRARY NAMES Cgl libCgl + HINTS ${COIN_ROOT_DIR}/lib/coin HINTS ${COIN_ROOT_DIR}/lib ) FIND_LIBRARY(COIN_CLP_LIBRARY NAMES Clp libClp + HINTS ${COIN_ROOT_DIR}/lib/coin HINTS ${COIN_ROOT_DIR}/lib ) FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY NAMES CoinUtils libCoinUtils + HINTS ${COIN_ROOT_DIR}/lib/coin HINTS ${COIN_ROOT_DIR}/lib ) FIND_LIBRARY(COIN_OSI_LIBRARY NAMES Osi libOsi + HINTS ${COIN_ROOT_DIR}/lib/coin HINTS ${COIN_ROOT_DIR}/lib ) FIND_LIBRARY(COIN_OSI_CBC_LIBRARY NAMES OsiCbc libOsiCbc + HINTS ${COIN_ROOT_DIR}/lib/coin HINTS ${COIN_ROOT_DIR}/lib ) FIND_LIBRARY(COIN_OSI_CLP_LIBRARY NAMES OsiClp libOsiClp + HINTS ${COIN_ROOT_DIR}/lib/coin HINTS ${COIN_ROOT_DIR}/lib ) FIND_LIBRARY(COIN_OSI_VOL_LIBRARY NAMES OsiVol libOsiVol + HINTS ${COIN_ROOT_DIR}/lib/coin HINTS ${COIN_ROOT_DIR}/lib ) FIND_LIBRARY(COIN_VOL_LIBRARY NAMES Vol libVol + HINTS ${COIN_ROOT_DIR}/lib/coin HINTS ${COIN_ROOT_DIR}/lib ) @@ -55,13 +65,13 @@ COIN_OSI_LIBRARY COIN_OSI_CBC_LIBRARY COIN_OSI_CLP_LIBRARY - COIN_OSI_VOL_LIBRARY - COIN_VOL_LIBRARY + # COIN_OSI_VOL_LIBRARY + # COIN_VOL_LIBRARY ) IF(COIN_FOUND) SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR}) - SET(COIN_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_OSI_VOL_LIBRARY};${COIN_VOL_LIBRARY}") + SET(COIN_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY}") SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}") SET(COIN_CBC_LIBRARIES ${COIN_LIBRARIES}) ENDIF(COIN_FOUND)