From 4425368e0c9d52509218242a7948c62889b1b64c Mon Sep 17 00:00:00 2001 From: sjunges Date: Wed, 9 Sep 2015 15:40:08 +0200 Subject: [PATCH 1/2] gurobi 6.05 for mac os support Former-commit-id: 29afa71b2d16fce3ee4f9a50d3130166f92d247f --- resources/cmake/FindGurobi.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/cmake/FindGurobi.cmake b/resources/cmake/FindGurobi.cmake index f05668d6d..ee0b987c4 100644 --- a/resources/cmake/FindGurobi.cmake +++ b/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" ) From e8408cdc7bb74225d826d0501b00d4422d97c484 Mon Sep 17 00:00:00 2001 From: sjunges Date: Wed, 9 Sep 2015 15:41:17 +0200 Subject: [PATCH 2/2] gurobi 6.05 for mac os support - second try Former-commit-id: 1dc5be581aeaf9f7a6df469b6367ff9610facda0 --- resources/cmake/FindGurobi.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/cmake/FindGurobi.cmake b/resources/cmake/FindGurobi.cmake index ee0b987c4..65330f799 100644 --- a/resources/cmake/FindGurobi.cmake +++ b/resources/cmake/FindGurobi.cmake @@ -40,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" @@ -51,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"