diff -r dd1443e4a34c -r 4000b7ef4e01 CMakeLists.txt --- a/CMakeLists.txt Wed Aug 07 07:08:38 2013 +0200 +++ b/CMakeLists.txt Thu Mar 28 14:52:43 2013 +0100 @@ -65,6 +65,7 @@ SET(LEMON_ENABLE_GLPK YES CACHE STRING "Enable GLPK solver backend.") SET(LEMON_ENABLE_ILOG YES CACHE STRING "Enable ILOG (CPLEX) solver backend.") SET(LEMON_ENABLE_COIN YES CACHE STRING "Enable COIN solver backend.") +SET(LEMON_ENABLE_SOPLEX YES CACHE STRING "Enable SoPlex solver backend.") IF(LEMON_ENABLE_GLPK) FIND_PACKAGE(GLPK 4.33) @@ -75,6 +76,9 @@ IF(LEMON_ENABLE_COIN) FIND_PACKAGE(COIN) ENDIF(LEMON_ENABLE_COIN) +IF(LEMON_ENABLE_SOPLEX) + FIND_PACKAGE(SOPLEX) +ENDIF(LEMON_ENABLE_SOPLEX) IF(GLPK_FOUND) SET(LEMON_HAVE_LP TRUE) @@ -92,6 +96,10 @@ SET(LEMON_HAVE_CLP TRUE) SET(LEMON_HAVE_CBC TRUE) ENDIF(COIN_FOUND) +IF(SOPLEX_FOUND) + SET(LEMON_HAVE_LP TRUE) + SET(LEMON_HAVE_SOPLEX TRUE) +ENDIF(SOPLEX_FOUND) IF(ILOG_FOUND) SET(DEFAULT_LP "CPLEX") @@ -102,14 +110,17 @@ ELSEIF(GLPK_FOUND) SET(DEFAULT_LP "GLPK") SET(DEFAULT_MIP "GLPK") +ELSEIF(SOPLEX_FOUND) + SET(DEFAULT_LP "SOPLEX") ENDIF() IF(NOT LEMON_DEFAULT_LP OR (NOT ILOG_FOUND AND (LEMON_DEFAULT_LP STREQUAL "CPLEX")) OR (NOT COIN_FOUND AND (LEMON_DEFAULT_LP STREQUAL "CLP")) OR - (NOT GLPK_FOUND AND (LEMON_DEFAULT_LP STREQUAL "GLPK"))) + (NOT GLPK_FOUND AND (LEMON_DEFAULT_LP STREQUAL "GLPK")) OR + (NOT SOPLEX_FOUND AND (LEMON_DEFAULT_LP STREQUAL "SOPLEX"))) SET(LEMON_DEFAULT_LP ${DEFAULT_LP} CACHE STRING - "Default LP solver backend (GLPK, CPLEX or CLP)" FORCE) + "Default LP solver backend (GLPK, CPLEX, CLP or SOPLEX)" FORCE) ENDIF() IF(NOT LEMON_DEFAULT_MIP OR (NOT ILOG_FOUND AND (LEMON_DEFAULT_MIP STREQUAL "CPLEX")) OR