Commit 79f4ff58 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'update_finders' into 'master'

Update finders for Gurobi and Qwt

See merge request !44
parents dd6910c4 54c32295
...@@ -27,6 +27,7 @@ find_path(GUROBI_INCLUDE_DIR ...@@ -27,6 +27,7 @@ find_path(GUROBI_INCLUDE_DIR
"/Library/gurobi502/mac64/include" "/Library/gurobi502/mac64/include"
"/Library/gurobi562/mac64/include" "/Library/gurobi562/mac64/include"
"/Library/gurobi650/mac64/include" "/Library/gurobi650/mac64/include"
"/Library/gurobi751/mac64/include"
"C:\\libs\\gurobi502\\include" "C:\\libs\\gurobi502\\include"
"C:\\libs\\gurobi562\\include" "C:\\libs\\gurobi562\\include"
"${GUROBI_BASE}/include" "${GUROBI_BASE}/include"
...@@ -34,6 +35,7 @@ find_path(GUROBI_INCLUDE_DIR ...@@ -34,6 +35,7 @@ find_path(GUROBI_INCLUDE_DIR
find_library( GUROBI_LIBRARY find_library( GUROBI_LIBRARY
NAMES gurobi NAMES gurobi
gurobi75
gurobi70 gurobi70
gurobi65 gurobi65
gurobi60 gurobi60
...@@ -45,9 +47,10 @@ find_library( GUROBI_LIBRARY ...@@ -45,9 +47,10 @@ find_library( GUROBI_LIBRARY
gurobi45 gurobi45
PATHS "$ENV{GUROBI_HOME}/lib" PATHS "$ENV{GUROBI_HOME}/lib"
"/Library/gurobi562/mac64/lib"
"/Library/gurobi502/mac64/lib" "/Library/gurobi502/mac64/lib"
"/Library/gurobi562/mac64/lib"
"/Library/gurobi650/mac64/lib" "/Library/gurobi650/mac64/lib"
"/Library/gurobi751/mac64/lib"
"C:\\libs\\gurobi562\\lib" "C:\\libs\\gurobi562\\lib"
"C:\\libs\\gurobi502\\lib" "C:\\libs\\gurobi502\\lib"
"${GUROBI_BASE}/lib" "${GUROBI_BASE}/lib"
...@@ -63,6 +66,7 @@ find_library( GUROBI_CXX_LIBRARY ...@@ -63,6 +66,7 @@ find_library( GUROBI_CXX_LIBRARY
PATHS "$ENV{GUROBI_HOME}/lib" PATHS "$ENV{GUROBI_HOME}/lib"
"/Library/gurobi562/mac64/lib" "/Library/gurobi562/mac64/lib"
"/Library/gurobi502/mac64/lib" "/Library/gurobi502/mac64/lib"
"/Library/gurobi751/mac64/lib"
"C:\\libs\\gurobi562\\lib" "C:\\libs\\gurobi562\\lib"
"C:\\libs\\gurobi502\\lib" "C:\\libs\\gurobi502\\lib"
"${GUROBI_BASE}/lib" "${GUROBI_BASE}/lib"
......
...@@ -61,6 +61,7 @@ find_path(QWT6_INCLUDE_DIR qwt.h ...@@ -61,6 +61,7 @@ find_path(QWT6_INCLUDE_DIR qwt.h
c:\\libs\\qwt-6.1.0 c:\\libs\\qwt-6.1.0
c:\\libs\\qwt-6.0.2 c:\\libs\\qwt-6.0.2
c:\\libs\\qwt-6.0.1 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 #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 ENV PATH
) )
...@@ -125,6 +126,7 @@ if (QWT6_VERSION_FOUND) ...@@ -125,6 +126,7 @@ if (QWT6_VERSION_FOUND)
if (NOT QWT6_LIBRARY) # if not the specific acg qwt installation was found, try system wide if (NOT QWT6_LIBRARY) # if not the specific acg qwt installation was found, try system wide
find_library(QWT6_LIBRARY NAMES qwt find_library(QWT6_LIBRARY NAMES qwt
PATHS PATHS
/opt/local/libexec/qt5/lib
/usr/local/qwt/lib /usr/local/qwt/lib
/opt/local/lib /opt/local/lib
/usr/local/lib /usr/local/lib
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment