Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synchronized FindIPOPT with latest YCM version #764

Merged
merged 1 commit into from
Nov 17, 2020
Merged

Synchronized FindIPOPT with latest YCM version #764

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cmake/FindIPOPT.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ if(NOT WIN32)
set(IPOPT_DIR /usr CACHE PATH "Path to IPOPT build directory")
endif()

find_path(IPOPT_INCLUDE_DIRS NAMES IpIpoptApplication.hpp PATH_SUFFIXES coin PATHS ${IPOPT_DIR}/include/coin)
find_path(IPOPT_INCLUDE_DIRS NAMES IpIpoptApplication.hpp PATH_SUFFIXES coin coin-or PATHS ${IPOPT_DIR}/include/coin)

find_library(IPOPT_LIBRARIES ipopt ${IPOPT_DIR}/lib
${IPOPT_DIR}/lib/coin)
Expand Down Expand Up @@ -128,7 +128,7 @@ else()

set(IPOPT_DIR $ENV{IPOPT_DIR} CACHE PATH "Path to IPOPT build directory")

find_path(IPOPT_INCLUDE_DIRS NAMES IpIpoptApplication.hpp PATH_SUFFIXES coin PATHS ${IPOPT_DIR}/include/coin)
find_path(IPOPT_INCLUDE_DIRS NAMES IpIpoptApplication.hpp PATH_SUFFIXES coin coin-or PATHS ${IPOPT_DIR}/include/coin)

find_library(IPOPT_IPOPT_LIBRARY_RELEASE libipopt ${IPOPT_DIR}/lib
${IPOPT_DIR}/lib/coin)
Expand Down Expand Up @@ -207,7 +207,9 @@ else()
find_library(IPOPT_${_LIB}_LIBRARY_RELEASE ${_lib} ${_IPOPT_IPOPT_LIBRARY_DIR})
find_library(IPOPT_${_LIB}_LIBRARY_DEBUG ${_lib}d ${_IPOPT_IPOPT_LIBRARY_DIR})
select_library_configurations(IPOPT_${_LIB})
list(APPEND IPOPT_LIBRARIES ${IPOPT_${_LIB}_LIBRARY})
if(NOT "${IPOPT_${_LIB}_LIBRARY}" MATCHES "NOTFOUND$")
list(APPEND IPOPT_LIBRARIES ${IPOPT_${_LIB}_LIBRARY})
endif()
endforeach()
endif()
endif()
Expand Down