improved cmake for z3 and gurobi

Former-commit-id: d85982abd2

CMakeLists.txt

@@ -60,7 +60,7 @@ find_package(Gurobi)
 find_package(TBB)
 find_package(Threads REQUIRED)
 find_package(GMP)
-find_package(Z3)
+find_package(Z3 QUIET)
 
 # If the DEBUG option was turned on, we will target a debug version and a release version otherwise.
 if (STORM_DEBUG)
@@ -222,7 +222,7 @@ set(STORM_HAVE_GLPK 1)
 set(STORM_CPP_CUDAFORSTORM_DEF "undef")
 
 # Z3 Defines
-set(STORM_HAVE_Z3 ${FOUND_Z3})
+set(STORM_HAVE_Z3 ${Z3_FOUND})
 
 # MathSAT Defines
 set(STORM_HAVE_MSAT ${ENABLE_MSAT})

resources/cmake/FindGurobi.cmake

@@ -18,6 +18,7 @@ find_path(GUROBI_INCLUDE_DIR
           NAMES gurobi_c++.h
           PATHS "$ENV{GUROBI_HOME}/include"
                   "/Library/gurobi502/mac64/include"
+                  "/Library/gurobi604/mac64/include"
                  "C:\\libs\\gurobi502\\include"
 				 "C:\\gurobi600\\win64\\include"
 				 "${GUROBI_ROOT}/include"
@@ -35,6 +36,7 @@ find_library( GUROBI_LIBRARY
         gurobi60        
               PATHS "$ENV{GUROBI_HOME}/lib" 
                     "/Library/gurobi502/mac64/lib"
+                    "/Library/gurobi604/mac64/lib"
                     "C:\\libs\\gurobi502\\lib"
 					"C:\\gurobi600\\win64\\lib"
 					"${GUROBI_ROOT}/lib"
@@ -44,6 +46,7 @@ find_library( GUROBI_CXX_LIBRARY
               NAMES gurobi_c++
               PATHS "$ENV{GUROBI_HOME}/lib" 
                     "/Library/gurobi502/mac64/lib"
+                    "/Library/gurobi604/mac64/lib"
                     "C:\\libs\\gurobi502\\lib"
 					"C:\\gurobi600\\win64\\lib"
 					"${GUROBI_ROOT}/lib"

resources/cmake/FindZ3.cmake

@@ -9,7 +9,7 @@
 
 # find include dir by searching for a concrete file, which definetely must be in it
 find_path(Z3_INCLUDE_DIR 
-            NAMES src/util/z3_exception.h #exemplary file, should only be available in z3
+            NAMES z3.h 
             PATHS ENV PATH INCLUDE
             PATH_SUFFIXES z3
          )