Commit 4a684cf6 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'cmake-Finders' into 'master'

Cmake finders

Updated cmake finders to fix some ipopt related errors

See merge request !11
parents 671e2b1d 11b6a0f7
......@@ -16,9 +16,11 @@ find_path( EIGEN3_INCLUDE_DIR
/usr/local/include
/usr/local/include/eigen3/
/opt/local/include/eigen3/
"c:\\libs\\Eigen-3.2.6"
"c:\\libs\\Eigen-3.2.6\\include"
"c:\\libs\\Eigen-3.2.1"
"c:\\libs\\Eigen-3.2.1\\include"
"c:\\libs\\Eigen-3.2\\include"
"c:\\libs\\Eigen-3.2.1\\include"
"c:\\libs\\Eigen-3.2\\include"
"c:\\libs\\eigen3\\include"
"c:\\libs\\eigen\\include"
${PROJECT_SOURCE_DIR}/MacOS/Libs/eigen3/include
......
......@@ -118,7 +118,7 @@ else( WIN32 )
IF ( SUITESPARSE_LIBRARY_DIR )
# Skipped, as this is set for apple in the block above
if (NOT APPLE)
# if (NOT APPLE)
list ( APPEND SUITESPARSE_LIBRARIES amd)
list ( APPEND SUITESPARSE_LIBRARIES btf)
list ( APPEND SUITESPARSE_LIBRARIES camd)
......@@ -130,7 +130,7 @@ else( WIN32 )
list ( APPEND SUITESPARSE_LIBRARIES klu)
# list ( APPEND SUITESPARSE_LIBRARIES spqr)
list ( APPEND SUITESPARSE_LIBRARIES umfpack)
endif()
# endif()
# Metis and spqr are optional
FIND_LIBRARY( SUITESPARSE_METIS_LIBRARY
......
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