Commit 81d49fed authored by David Bommes's avatar David Bommes
Browse files

adjusted finder for gurobi4.5

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@11810 383ad7c9-94d9-4d36-a494-682f7c89f535
parent ebf8c6a4
...@@ -7,16 +7,16 @@ if (WIN32) ...@@ -7,16 +7,16 @@ if (WIN32)
find_path(GUROBI_INCLUDE_DIR NAMES gurobi_c++.h find_path(GUROBI_INCLUDE_DIR NAMES gurobi_c++.h
PREFIXES SRC PREFIXES SRC
PATHS PATHS
"C:\\libs\\gurobi40" "C:\\libs\\gurobi45"
${GUROBI_INCLUDE_PATH} ${GUROBI_INCLUDE_PATH}
) )
find_library( GUROBI_LIBRARY_RELEASE find_library( GUROBI_LIBRARY_RELEASE
SuperLU SuperLU
PATHS "C:\\libs\\gurobi40\\lib" ) PATHS "C:\\libs\\gurobi45\\lib" )
find_library( GUROBI_LIBRARY_DEBUG find_library( GUROBI_LIBRARY_DEBUG
SuperLUd SuperLUd
PATHS "C:\\libs\\gurobi40\\lib" ) PATHS "C:\\libs\\gurobi45\\lib" )
set ( GUROBI_LIBRARY "optimized;${GUROBI_LIBRARY_RELEASE};debug;${GUROBI_LIBRARY_DEBUG}" CACHE STRING "GUROBI Libraries" ) set ( GUROBI_LIBRARY "optimized;${GUROBI_LIBRARY_RELEASE};debug;${GUROBI_LIBRARY_DEBUG}" CACHE STRING "GUROBI Libraries" )
...@@ -43,7 +43,7 @@ ELSE( WIN32 ) ...@@ -43,7 +43,7 @@ ELSE( WIN32 )
SET(GUROBI_FOUND TRUE) SET(GUROBI_FOUND TRUE)
SET(GUROBI_INCLUDE_DIR ${GUROBI_INCLUDE_DIR}) SET(GUROBI_INCLUDE_DIR ${GUROBI_INCLUDE_DIR})
SET(GUROBI_LIBRARY_DIR "$ENV{GUROBI_HOME}/lib/" CACHE PATH "Path to GUROBI Library") SET(GUROBI_LIBRARY_DIR "$ENV{GUROBI_HOME}/lib/" CACHE PATH "Path to GUROBI Library")
SET(GUROBI_LIBRARY "gurobi40;gurobi_c++;pthread" CACHE STRING "GUROBI Libraries") SET(GUROBI_LIBRARY "gurobi45;gurobi_c++;pthread" CACHE STRING "GUROBI Libraries")
MESSAGE(STATUS "${GUROBI_LIBRARY_DIR}") MESSAGE(STATUS "${GUROBI_LIBRARY_DIR}")
MESSAGE(STATUS "${GUROBI_LIBRARY}") MESSAGE(STATUS "${GUROBI_LIBRARY}")
ELSE(GUROBI_INCLUDE_DIR) ELSE(GUROBI_INCLUDE_DIR)
......
Supports Markdown
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