From 03a77f9c6a738a3a73be0dfb5f449fbd61426ebd Mon Sep 17 00:00:00 2001 From: Tim Quatmann <tim.quatmann@cs.rwth-aachen.de> Date: Thu, 9 Jan 2020 13:07:06 +0100 Subject: [PATCH] Added new Gurobi version --- resources/3rdparty/CMakeLists.txt | 5 +++-- resources/cmake/find_modules/FindGurobi.cmake | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index 0dd695d7d..a23de4601 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -206,10 +206,11 @@ if (STORM_USE_GUROBI) list(APPEND STORM_DEP_TARGETS Gurobi_SHARED) else() # The FindGurobi.cmake script needs to be updated every now and then as the library file contains the version number... - message(FATAL_ERROR "Gurobi Library ${GUROBI_LIBRARY} not found. If your Gurobi Version is higher then 8.1.0, please contact the Storm developers.") + message(FATAL_ERROR "Gurobi Library ${GUROBI_LIBRARY} not found. If your Gurobi Version is higher then 9.0.0, please contact the Storm developers.") endif() else() - message(FATAL_ERROR "Gurobi Library requested but was not found. Make sure that GUROBI_ROOT points to the correct directory (containing include/ and lib/ subdirectories).") + # The FindGurobi.cmake script needs to be updated every now and then as the library file contains the version number ... + message(FATAL_ERROR "Gurobi Library requested but was not found. Make sure that GUROBI_ROOT points to the correct directory (containing include/ and lib/ subdirectories). If your Gurobi Version is higher then 9.0.0, please contact the Storm developers.") endif() else() set(STORM_HAVE_GUROBI OFF) diff --git a/resources/cmake/find_modules/FindGurobi.cmake b/resources/cmake/find_modules/FindGurobi.cmake index 59d573e3b..1378e0ab8 100644 --- a/resources/cmake/find_modules/FindGurobi.cmake +++ b/resources/cmake/find_modules/FindGurobi.cmake @@ -1,5 +1,6 @@ #### Taken from http://www.openflipper.org/svnrepo/CoMISo/trunk/CoMISo/cmake/FindGUROBI.cmake - +#### This file needs to be updated regularly to include new Gurobi releases. +#### Also update the error message in the Gurobi section of ../resources/CMakeLists.txt # - Try to find GUROBI # Once done this will define @@ -27,6 +28,7 @@ find_path(GUROBI_INCLUDE_DIR "/Library/gurobi702/mac64/include" "/Library/gurobi801/mac64/include" "/Library/gurobi810/mac64/include" + "/Library/gurobi900/mac64/include" "${GUROBI_ROOT}/include" ) @@ -45,6 +47,7 @@ find_library( GUROBI_LIBRARY gurobi75 gurobi80 gurobi81 + gurobi90 PATHS "$ENV{GUROBI_HOME}/lib" "/Library/gurobi502/mac64/lib" "/Library/gurobi602/mac64/lib" @@ -57,6 +60,7 @@ find_library( GUROBI_LIBRARY "/Library/gurobi801/mac64/lib" "/Library/gurobi810/mac64/lib" "/Library/gurobi811/mac64/lib" + "/Library/gurobi900/mac64/lib" "${GUROBI_ROOT}/lib" ) @@ -73,7 +77,7 @@ find_library( GUROBI_CXX_LIBRARY "/Library/gurobi702/mac64/lib" "/Library/gurobi801/mac64/lib" "/Library/gurobi810/mac64/lib" - "/Library/gurobi811/mac64/lib" + "/Library/gurobi900/mac64/lib" "${GUROBI_ROOT}/lib" )