Merge branch 'master' into prism-pomdp

resources/3rdparty/CMakeLists.txt

@@ -170,8 +170,8 @@ if(Z3_FOUND)
             set(STORM_Z3_API_USES_STANDARD_INTEGERS ON)
         endif()
 
-        add_imported_library(z3 SHARED ${Z3_LIBRARIES} ${Z3_INCLUDE_DIRS})
-        list(APPEND STORM_DEP_TARGETS z3_SHARED)
+        add_imported_library(Z3 SHARED ${Z3_LIBRARIES} ${Z3_INCLUDE_DIRS})
+        list(APPEND STORM_DEP_TARGETS Z3_SHARED)
     else()
         message(WARNING "Storm - Could not obtain Z3 version. Building of Prism/JANI models will not be supported.")
         set(Z3_FOUND FALSE)
@@ -197,13 +197,13 @@ include(${STORM_3RDPARTY_SOURCE_DIR}/include_glpk.cmake)
 #############################################################
 
 if (STORM_USE_GUROBI)
-    find_package(Gurobi QUIET REQUIRED)
+    find_package(GUROBI QUIET REQUIRED)
     set(STORM_HAVE_GUROBI ${GUROBI_FOUND})
     if (GUROBI_FOUND)
 		if (EXISTS ${GUROBI_LIBRARY})
             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)
+            add_imported_library(GUROBI SHARED ${GUROBI_LIBRARY} ${GUROBI_INCLUDE_DIRS})
+            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 9.0.0, please contact the Storm developers.")
@@ -499,8 +499,8 @@ list(APPEND STORM_DEP_TARGETS sylvan_STATIC)
 find_package(HWLOC QUIET REQUIRED)
 if(HWLOC_FOUND)
     message(STATUS "Storm - Linking with hwloc ${HWLOC_VERSION}.")
-    add_imported_library(hwloc STATIC ${HWLOC_LIBRARIES} "")
-    list(APPEND STORM_DEP_TARGETS hwloc_STATIC)
+    add_imported_library(HWLOC STATIC ${HWLOC_LIBRARIES} "")
+    list(APPEND STORM_DEP_TARGETS HWLOC_STATIC)
 else()
     if(${OPERATING_SYSTEM} MATCHES "Linux")
         message(FATAL_ERROR "HWLOC is required on Linux but was not found.")