Merge branch 'update_finders' into 'master'

Update finders for Gurobi and Qwt

See merge request !44

cmake/FindGUROBI.cmake

@@ -27,6 +27,7 @@ find_path(GUROBI_INCLUDE_DIR
                   "/Library/gurobi502/mac64/include"
                   "/Library/gurobi562/mac64/include"
                   "/Library/gurobi650/mac64/include"
+                  "/Library/gurobi751/mac64/include"
                  "C:\\libs\\gurobi502\\include"
                  "C:\\libs\\gurobi562\\include"
 				 "${GUROBI_BASE}/include"
@@ -34,6 +35,7 @@ find_path(GUROBI_INCLUDE_DIR
 
 find_library( GUROBI_LIBRARY 
               NAMES gurobi
+                    gurobi75
                     gurobi70
                     gurobi65
                     gurobi60
@@ -45,9 +47,10 @@ find_library( GUROBI_LIBRARY
                     gurobi45
 
               PATHS "$ENV{GUROBI_HOME}/lib" 
-                    "/Library/gurobi562/mac64/lib"
                     "/Library/gurobi502/mac64/lib"
+                    "/Library/gurobi562/mac64/lib"
                     "/Library/gurobi650/mac64/lib"
+                    "/Library/gurobi751/mac64/lib"
                     "C:\\libs\\gurobi562\\lib"
                     "C:\\libs\\gurobi502\\lib"
 				    "${GUROBI_BASE}/lib"
@@ -63,6 +66,7 @@ find_library( GUROBI_CXX_LIBRARY
               PATHS "$ENV{GUROBI_HOME}/lib" 
                     "/Library/gurobi562/mac64/lib"
                     "/Library/gurobi502/mac64/lib"
+                    "/Library/gurobi751/mac64/lib"
                     "C:\\libs\\gurobi562\\lib"
                     "C:\\libs\\gurobi502\\lib"
 					"${GUROBI_BASE}/lib"

cmake/FindQwt6.cmake

@@ -61,6 +61,7 @@ find_path(QWT6_INCLUDE_DIR qwt.h
                c:\\libs\\qwt-6.1.0
                c:\\libs\\qwt-6.0.2
                c:\\libs\\qwt-6.0.1
+               /opt/local/libexec/qt5/lib/qwt.framework/Versions/6/Headers/
                #PATH_SUFFIXES qwt qwt6 qwt-6.1.0 qwt-6.0.2 qwt-6.0.1 include qwt/include qwt6/include #deactivated for acg dir
                ENV PATH
                )
@@ -125,6 +126,7 @@ if (QWT6_VERSION_FOUND)
     if (NOT QWT6_LIBRARY) # if not the specific acg qwt installation was found, try system wide
       find_library(QWT6_LIBRARY NAMES qwt
         PATHS
+        /opt/local/libexec/qt5/lib
         /usr/local/qwt/lib
         /opt/local/lib
         /usr/local/lib