Commit f2ebc879 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'update_finders' into 'master'

Update IPOPT related finders

See merge request !167
parents 13d4d19a 94ee2cd4
...@@ -87,8 +87,8 @@ if (WIN32) ...@@ -87,8 +87,8 @@ if (WIN32)
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" HINTS "$ENV{IPOPT_HOME}/include/coin"
"/usr/include/coin" PATHS "/usr/include/coin"
"~/sw/Ipopt-3.12.4-installed/include/coin" "~/sw/Ipopt-3.12.4-installed/include/coin"
) )
......
...@@ -36,30 +36,31 @@ endif() ...@@ -36,30 +36,31 @@ endif()
find_path(METIS_INCLUDE_DIR NAMES metis.h find_path(METIS_INCLUDE_DIR NAMES metis.h
PATHS "$ENV{IPOPT_HOME}/ThirdParty/Metis/metis-4.0/Lib/" HINTS "$ENV{IPOPT_HOME}/ThirdParty/Metis/metis-4.0/Lib/"
"/usr/include/" "$ENV{IPOPT_HOME}/include/coin/ThirdParty/"
PATHS "/usr/include/"
"/usr/include/metis" "/usr/include/metis"
"/opt/local/include" "/opt/local/include"
"/opt/local/include/metis" "/opt/local/include/metis"
"${VS_SEARCH_PATH}Ipopt-3.12.9/include/metis" "${VS_SEARCH_PATH}Ipopt-3.12.9/include/metis"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/metis" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/metis"
) )
find_library( METIS_LIBRARY_RELEASE find_library( METIS_LIBRARY_RELEASE
metis coinmetis coinmetis metis
PATHS "$ENV{IPOPT_HOME}/lib/" HINTS "$ENV{IPOPT_HOME}/lib/"
"/usr/lib" PATHS "/usr/lib"
"/opt/local/lib" "/opt/local/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.9/lib" "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
) )
find_library( METIS_LIBRARY_DEBUG find_library( METIS_LIBRARY_DEBUG
metisd coinmetisd coinmetisd metisd
PATHS "$ENV{IPOPT_HOME}/lib/" HINTS "$ENV{IPOPT_HOME}/lib/"
"/usr/lib" PATHS "/usr/lib"
"/opt/local/lib" "/opt/local/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.9/lib" "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
) )
......
...@@ -35,24 +35,25 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" ) ...@@ -35,24 +35,25 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
endif() endif()
find_path(MUMPS_INCLUDE_DIR NAMES dmumps_c.h find_path(MUMPS_INCLUDE_DIR NAMES dmumps_c.h
PATHS "$ENV{IPOPT_HOME}/ThirdParty/Mumps/MUMPS/include/" HINTS "$ENV{IPOPT_HOME}/ThirdParty/Mumps/MUMPS/include/"
"/usr/include/" "$ENV{IPOPT_HOME}/include/coin/ThirdParty"
"${VS_SEARCH_PATH}Ipopt-3.12.9/include/mumps" PATHS "/usr/include/"
"${VS_SEARCH_PATH}Ipopt-3.12.9/include/mumps"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/mumps" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/mumps"
) )
find_library( MUMPS_LIBRARY_DEBUG find_library( MUMPS_LIBRARY_DEBUG
dmumpsd coinmumpsd coinmumpscd coinmumpsd dmumpsd coinmumpscd
PATHS "$ENV{IPOPT_HOME}/lib/" HITNS "$ENV{IPOPT_HOME}/lib/"
"/usr/lib" PATHS "/usr/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.9/lib" "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
) )
find_library( MUMPS_LIBRARY_RELEASE find_library( MUMPS_LIBRARY_RELEASE
dmumps coinmumps coinmumpsc coinmumps dmumps coinmumpsc
PATHS "$ENV{IPOPT_HOME}/lib/" HINTS "$ENV{IPOPT_HOME}/lib/"
"/usr/lib" PATHS "/usr/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.9/lib" "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
"${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib" "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
) )
......
This diff is collapsed.
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