Commit 586bffa5 authored by Hans-Christian Ebke's avatar Hans-Christian Ebke
Browse files

Fixed order in which the GUROBI libraries are enumerated by FindGUROBI.

(In some settings linking failed with the old order.)


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@18588 383ad7c9-94d9-4d36-a494-682f7c89f535
parent d639bef0
...@@ -8,7 +8,7 @@ if (GUROBI_INCLUDE_DIR) ...@@ -8,7 +8,7 @@ if (GUROBI_INCLUDE_DIR)
# in cache already # in cache already
set(GUROBI_FOUND TRUE) set(GUROBI_FOUND TRUE)
set(GUROBI_INCLUDE_DIRS "${GUROBI_INCLUDE_DIR}" ) set(GUROBI_INCLUDE_DIRS "${GUROBI_INCLUDE_DIR}" )
set(GUROBI_LIBRARIES "${GUROBI_LIBRARY};${GUROBI_CXX_LIBRARY}" ) set(GUROBI_LIBRARIES "${GUROBI_CXX_LIBRARY};${GUROBI_LIBRARY}" )
else (GUROBI_INCLUDE_DIR) else (GUROBI_INCLUDE_DIR)
find_path(GUROBI_INCLUDE_DIR find_path(GUROBI_INCLUDE_DIR
...@@ -46,7 +46,7 @@ find_library( GUROBI_CXX_LIBRARY ...@@ -46,7 +46,7 @@ find_library( GUROBI_CXX_LIBRARY
) )
set(GUROBI_INCLUDE_DIRS "${GUROBI_INCLUDE_DIR}" ) set(GUROBI_INCLUDE_DIRS "${GUROBI_INCLUDE_DIR}" )
set(GUROBI_LIBRARIES "${GUROBI_LIBRARY};${GUROBI_CXX_LIBRARY}" ) set(GUROBI_LIBRARIES "${GUROBI_CXX_LIBRARY};${GUROBI_LIBRARY}" )
# use c++ headers as default # use c++ headers as default
# set(GUROBI_COMPILER_FLAGS "-DIL_STD" CACHE STRING "Gurobi Compiler Flags") # set(GUROBI_COMPILER_FLAGS "-DIL_STD" CACHE STRING "Gurobi Compiler Flags")
...@@ -55,7 +55,7 @@ include(FindPackageHandleStandardArgs) ...@@ -55,7 +55,7 @@ include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set LIBCPLEX_FOUND to TRUE # handle the QUIETLY and REQUIRED arguments and set LIBCPLEX_FOUND to TRUE
# if all listed variables are TRUE # if all listed variables are TRUE
find_package_handle_standard_args(GUROBI DEFAULT_MSG find_package_handle_standard_args(GUROBI DEFAULT_MSG
GUROBI_LIBRARY GUROBI_CXX_LIBRARY GUROBI_INCLUDE_DIR) GUROBI_CXX_LIBRARY GUROBI_LIBRARY GUROBI_INCLUDE_DIR)
mark_as_advanced(GUROBI_INCLUDE_DIR GUROBI_LIBRARY GUROBI_CXX_LIBRARY) mark_as_advanced(GUROBI_INCLUDE_DIR GUROBI_LIBRARY GUROBI_CXX_LIBRARY)
......
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