Merge branch 'future' into python_api

Former-commit-id: edf14f1618

resources/cmake/FindGurobi.cmake

@@ -17,11 +17,12 @@ 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"
-                  "C:\\libs\\gurobi502\\include"
-                  "C:\\gurobi600\\win64\\include"
+                    "/Library/gurobi502/mac64/include"
+                    "/Library/gurobi602/mac64/include"
+                    "/Library/gurobi604/mac64/include"
+                    "/Library/gurobi605/mac64/include"
+                    "C:\\libs\\gurobi502\\include"
+                    "C:\\gurobi600\\win64\\include"
 				 "${GUROBI_ROOT}/include"
           )
 
@@ -39,6 +40,7 @@ find_library( GUROBI_LIBRARY
                     "/Library/gurobi502/mac64/lib"
                     "/Library/gurobi602/mac64/lib"
                     "/Library/gurobi604/mac64/lib"
+                    "/Library/gurobi605/mac64/lib"
                     "C:\\libs\\gurobi502\\lib"
 					"C:\\gurobi600\\win64\\lib"
 					"${GUROBI_ROOT}/lib"
@@ -50,6 +52,7 @@ find_library( GUROBI_CXX_LIBRARY
                     "/Library/gurobi502/mac64/lib"
                     "/Library/gurobi602/mac64/lib"
                     "/Library/gurobi604/mac64/lib"
+                    "/Library/gurobi605/mac64/lib"
                     "C:\\libs\\gurobi502\\lib"
 					"C:\\gurobi600\\win64\\lib"
 					"${GUROBI_ROOT}/lib"