Commit bf11a00c authored by David Bommes's avatar David Bommes
Browse files

adapted IPOPT Finder for MacOS

git-svn-id: http://www.openflipper.org/svnrepo/CoMISo/trunk@196 1355f012-dd97-4b2f-ae87-10fa9f823a57
parent a7c794d6
...@@ -24,16 +24,19 @@ find_path(CPLEX_CONCERT_INCLUDE_DIR ...@@ -24,16 +24,19 @@ find_path(CPLEX_CONCERT_INCLUDE_DIR
find_library( CPLEX_LIBRARY find_library( CPLEX_LIBRARY
cplex cplex
PATHS "$ENV{CPLEX_DIR}/cplex/lib/x86-64_sles10_4.1/static_pic" PATHS "$ENV{CPLEX_DIR}/cplex/lib/x86-64_sles10_4.1/static_pic"
"$ENV{CPLEX_DIR}/cplex/lib/x86-64_darwin/static_pic/"
) )
find_library( CPLEX_ILO_LIBRARY find_library( CPLEX_ILO_LIBRARY
ilocplex ilocplex
PATHS "$ENV{CPLEX_DIR}/cplex/lib/x86-64_sles10_4.1/static_pic" PATHS "$ENV{CPLEX_DIR}/cplex/lib/x86-64_sles10_4.1/static_pic"
"$ENV{CPLEX_DIR}/cplex/lib/x86-64_darwin/static_pic/"
) )
find_library( CPLEX_CONCERT_LIBRARY find_library( CPLEX_CONCERT_LIBRARY
concert concert
PATHS "$ENV{CPLEX_DIR}/concert/lib/x86-64_sles10_4.1/static_pic" PATHS "$ENV{CPLEX_DIR}/concert/lib/x86-64_sles10_4.1/static_pic"
"$ENV{CPLEX_DIR}/concert/lib/x86-64_darwin/static_pic/"
) )
......
...@@ -37,17 +37,6 @@ if (WIN32) ...@@ -37,17 +37,6 @@ if (WIN32)
SET(IPOPT_INCLUDE_DIR ${IPOPT_INCLUDE_DIR}) SET(IPOPT_INCLUDE_DIR ${IPOPT_INCLUDE_DIR})
ENDIF(IPOPT_INCLUDE_DIR) ENDIF(IPOPT_INCLUDE_DIR)
ELSEIF(APPLE)
find_path(IPOPT_INCLUDE_DIR NAMES gurobi_c++.h
PATHS "${CMAKE_SOURCE_DIR}/MacOS/Libs/gurobi40"
${IPOPT_INCLUDE_PATH}
)
find_library( IPOPT_LIBRARY
SuperLU
PATHS "${CMAKE_SOURCE_DIR}/MacOS/Libs/gurobi40")
ELSE( WIN32 ) ELSE( WIN32 )
find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp
PATHS "$ENV{IPOPT_HOME}/include/coin" PATHS "$ENV{IPOPT_HOME}/include/coin"
...@@ -65,7 +54,9 @@ ELSE( WIN32 ) ...@@ -65,7 +54,9 @@ ELSE( WIN32 )
# set optional path to HSL Solver # set optional path to HSL Solver
find_path(IPOPT_HSL_LIBRARY_DIR NAMES libhsl.so find_path(IPOPT_HSL_LIBRARY_DIR
NAMES libhsl.so
libhsl.dylib
PATHS "$ENV{IPOPT_HSL_LIBRARY_PATH}" PATHS "$ENV{IPOPT_HSL_LIBRARY_PATH}"
"$ENV{HOME}/opt/HSL/lib" "$ENV{HOME}/opt/HSL/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