COIN-OR::LEMON - Graph Library

Changeset 1398:389416f8a995 in lemon


Ignore:
Timestamp:
10/17/18 17:24:14 (12 months ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Phase:
public
Message:

Better MIP solver discovery and support linking to CLP/CBC on Windows (#614)

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r1344 r1398  
    8383IF(LEMON_ENABLE_GLPK)
    8484  FIND_PACKAGE(GLPK 4.33)
     85  IF(GLPK_FOUND)
     86    SET(LEMON_HAVE_LP TRUE)
     87    SET(LEMON_HAVE_MIP TRUE)
     88    SET(LEMON_HAVE_GLPK TRUE)
     89  ENDIF(GLPK_FOUND)
    8590ENDIF(LEMON_ENABLE_GLPK)
    8691IF(LEMON_ENABLE_ILOG)
    8792  FIND_PACKAGE(ILOG)
     93  IF(ILOG_FOUND)
     94    SET(LEMON_HAVE_LP TRUE)
     95    SET(LEMON_HAVE_MIP TRUE)
     96    SET(LEMON_HAVE_CPLEX TRUE)
     97  ENDIF(ILOG_FOUND)
    8898ENDIF(LEMON_ENABLE_ILOG)
    8999IF(LEMON_ENABLE_COIN)
    90100  FIND_PACKAGE(COIN)
     101  IF(COIN_FOUND)
     102    SET(LEMON_HAVE_LP TRUE)
     103    SET(LEMON_HAVE_MIP TRUE)
     104    SET(LEMON_HAVE_CLP TRUE)
     105    SET(LEMON_HAVE_CBC TRUE)
     106  ENDIF(COIN_FOUND)
    91107ENDIF(LEMON_ENABLE_COIN)
    92108IF(LEMON_ENABLE_SOPLEX)
    93109  FIND_PACKAGE(SOPLEX)
     110  IF(SOPLEX_FOUND)
     111    SET(LEMON_HAVE_LP TRUE)
     112    SET(LEMON_HAVE_SOPLEX TRUE)
     113  ENDIF(SOPLEX_FOUND)
    94114ENDIF(LEMON_ENABLE_SOPLEX)
    95 
    96 IF(GLPK_FOUND)
    97   SET(LEMON_HAVE_LP TRUE)
    98   SET(LEMON_HAVE_MIP TRUE)
    99   SET(LEMON_HAVE_GLPK TRUE)
    100 ENDIF(GLPK_FOUND)
    101 IF(ILOG_FOUND)
    102   SET(LEMON_HAVE_LP TRUE)
    103   SET(LEMON_HAVE_MIP TRUE)
    104   SET(LEMON_HAVE_CPLEX TRUE)
    105 ENDIF(ILOG_FOUND)
    106 IF(COIN_FOUND)
    107   SET(LEMON_HAVE_LP TRUE)
    108   SET(LEMON_HAVE_MIP TRUE)
    109   SET(LEMON_HAVE_CLP TRUE)
    110   SET(LEMON_HAVE_CBC TRUE)
    111 ENDIF(COIN_FOUND)
    112 IF(SOPLEX_FOUND)
    113   SET(LEMON_HAVE_LP TRUE)
    114   SET(LEMON_HAVE_SOPLEX TRUE)
    115 ENDIF(SOPLEX_FOUND)
    116115
    117116IF(ILOG_FOUND)
  • cmake/FindCOIN.cmake

    r1232 r1398  
    6666)
    6767
     68FIND_LIBRARY(COIN_PTHREADS_LIBRARY
     69  NAMES pthreads libpthreads
     70  HINTS ${COIN_ROOT_DIR}/lib/coin
     71  HINTS ${COIN_ROOT_DIR}/lib
     72)
     73
    6874INCLUDE(FindPackageHandleStandardArgs)
    6975FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG
     
    8389IF(COIN_FOUND)
    8490  SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
    85   SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_ZLIB_LIBRARY};${COIN_BZ2_LIBRARY}")
     91  SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
    8692  IF(COIN_ZLIB_LIBRARY)
    8793    SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_ZLIB_LIBRARY}")
     
    9096    SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_BZ2_LIBRARY}")
    9197  ENDIF(COIN_BZ2_LIBRARY)
    92   SET(COIN_CBC_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_ZLIB_LIBRARY};${COIN_BZ2_LIBRARY};${COIN_CLP_LIBRARIES}")
     98   IF(COIN_PTHREADS_LIBRARY)
     99    SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_PTHREADS_LIBRARY}")
     100  ENDIF(COIN_PTHREADS_LIBRARY)
     101  SET(COIN_CBC_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_CLP_LIBRARIES}")
    93102  SET(COIN_LIBRARIES ${COIN_CBC_LIBRARIES})
    94103ENDIF(COIN_FOUND)
Note: See TracChangeset for help on using the changeset viewer.