From 542f94babd22317de232e8901ac1a54c205ff647 Mon Sep 17 00:00:00 2001
From: Sebastian Junges <sebastian.junges@rwth-aachen.de>
Date: Fri, 6 Mar 2020 12:16:19 -0800
Subject: [PATCH] report on gurobi library, extended libraries and prefer
 (empirically) newer versions over older versions

---
 resources/3rdparty/CMakeLists.txt             |  2 +-
 resources/cmake/find_modules/FindGurobi.cmake | 95 ++++++++++---------
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt
index a23de4601..46e927d85 100644
--- a/resources/3rdparty/CMakeLists.txt
+++ b/resources/3rdparty/CMakeLists.txt
@@ -201,7 +201,7 @@ if (STORM_USE_GUROBI)
     set(STORM_HAVE_GUROBI ${GUROBI_FOUND})
     if (GUROBI_FOUND)
 		if (EXISTS ${GUROBI_LIBRARY})
-            message (STATUS "Storm - Linking with Gurobi.")
+            message (STATUS "Storm - Linking with Gurobi (${GUROBI_CXX_LIBRARY}).")
             add_imported_library(Gurobi SHARED ${GUROBI_LIBRARY} ${GUROBI_INCLUDE_DIRS})
             list(APPEND STORM_DEP_TARGETS Gurobi_SHARED)
         else()
diff --git a/resources/cmake/find_modules/FindGurobi.cmake b/resources/cmake/find_modules/FindGurobi.cmake
index 1378e0ab8..a0e1f09d1 100644
--- a/resources/cmake/find_modules/FindGurobi.cmake
+++ b/resources/cmake/find_modules/FindGurobi.cmake
@@ -18,66 +18,71 @@ else (GUROBI_INCLUDE_DIR)
 find_path(GUROBI_INCLUDE_DIR 
           NAMES gurobi_c++.h
           PATHS "$ENV{GUROBI_HOME}/include"
-                    "/Library/gurobi502/mac64/include"
-                    "/Library/gurobi602/mac64/include"
-                    "/Library/gurobi604/mac64/include"
-                    "/Library/gurobi605/mac64/include"
-                    "/Library/gurobi650/mac64/include"
-                    "/Library/gurobi651/mac64/include"
-                    "/Library/gurobi652/mac64/include"
-                    "/Library/gurobi702/mac64/include"
-                    "/Library/gurobi801/mac64/include"
-                    "/Library/gurobi810/mac64/include"
                     "/Library/gurobi900/mac64/include"
+                    "/Library/gurobi811/mac64/include"
+                    "/Library/gurobi810/mac64/include"
+                    "/Library/gurobi801/mac64/include"
+                    "/Library/gurobi702/mac64/include"
+                    "/Library/gurobi652/mac64/include"
+                    "/Library/gurobi651/mac64/include"
+                    "/Library/gurobi650/mac64/include"
+                    "/Library/gurobi605/mac64/include"
+                    "/Library/gurobi604/mac64/include"
+                    "/Library/gurobi602/mac64/include"
+                    "/Library/gurobi502/mac64/include"
                     "${GUROBI_ROOT}/include"
           )
 
 find_library( GUROBI_LIBRARY 
               NAMES gurobi
-		    gurobi45
-		    gurobi46
-        gurobi50 
-        gurobi51
-        gurobi52
-        gurobi55
-        gurobi56
-        gurobi60
-        gurobi65
-        gurobi70
-        gurobi75
-        gurobi80
-        gurobi81
         gurobi90
+        gurobi81
+        gurobi80
+        gurobi75
+        gurobi70
+        gurobi65
+        gurobi60
+        gurobi56
+        gurobi55
+        gurobi52
+        gurobi51
+        gurobi50
+        gurobi46
+        gurobi45
               PATHS "$ENV{GUROBI_HOME}/lib"
-                    "/Library/gurobi502/mac64/lib"
-                    "/Library/gurobi602/mac64/lib"
-                    "/Library/gurobi604/mac64/lib"
-                    "/Library/gurobi605/mac64/lib"
-                    "/Library/gurobi650/mac64/lib"
-                    "/Library/gurobi651/mac64/lib"
-                    "/Library/gurobi652/mac64/lib"
-                    "/Library/gurobi702/mac64/lib"
-                    "/Library/gurobi801/mac64/lib"
-                    "/Library/gurobi810/mac64/lib"
-                    "/Library/gurobi811/mac64/lib"
+
                     "/Library/gurobi900/mac64/lib"
+                    "/Library/gurobi811/mac64/lib"
+                    "/Library/gurobi810/mac64/lib"
+                    "/Library/gurobi801/mac64/lib"
+                    "/Library/gurobi702/mac64/lib"
+                    "/Library/gurobi652/mac64/lib"
+                    "/Library/gurobi651/mac64/lib"
+                    "/Library/gurobi650/mac64/lib"
+                    "/Library/gurobi605/mac64/lib"
+                    "/Library/gurobi604/mac64/lib"
+                    "/Library/gurobi602/mac64/lib"
+                    "/Library/gurobi502/mac64/lib"
                     "${GUROBI_ROOT}/lib"
               )
 
 find_library( GUROBI_CXX_LIBRARY 
               NAMES gurobi_c++
-              PATHS "$ENV{GUROBI_HOME}/lib" 
-                    "/Library/gurobi502/mac64/lib"
-                    "/Library/gurobi602/mac64/lib"
-                    "/Library/gurobi604/mac64/lib"
-                    "/Library/gurobi605/mac64/lib"
-                    "/Library/gurobi650/mac64/lib"
-                    "/Library/gurobi651/mac64/lib"
-                    "/Library/gurobi652/mac64/lib"
-                    "/Library/gurobi702/mac64/lib"
-                    "/Library/gurobi801/mac64/lib"
-                    "/Library/gurobi810/mac64/lib"
+              PATHS "$ENV{GUROBI_HOME}/lib"
+
                     "/Library/gurobi900/mac64/lib"
+                    "/Library/gurobi811/mac64/lib"
+                    "/Library/gurobi810/mac64/lib"
+                    "/Library/gurobi801/mac64/lib"
+                    "/Library/gurobi702/mac64/lib"
+                    "/Library/gurobi652/mac64/lib"
+                    "/Library/gurobi651/mac64/lib"
+                    "/Library/gurobi650/mac64/lib"
+                    "/Library/gurobi605/mac64/lib"
+                    "/Library/gurobi604/mac64/lib"
+                    "/Library/gurobi602/mac64/lib"
+                    "/Library/gurobi502/mac64/lib"
+
                     "${GUROBI_ROOT}/lib"
               )