Skip to content

Commit 1449874

Browse files
committed
Merge remote-tracking branch 'origin/v91-bugfix' into v9-minor
2 parents 9f144a2 + 3ce09df commit 1449874

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ Build system
8282
### Cmake
8383

8484
- Fixed compilation and linking with HiGHS. To use HiGHS, cmake now requires to specify the directory containing the `highs-config.cmake` file via `-DHIGHS_DIR`.
85+
- Extended identification of Ipopt library on Windows to also look for ipopt.dll.lib, as this is used since Ipopt 3.13.0 (2019)
8586

8687
### Makefile
8788

cmake/Modules/FindIPOPT.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ else()
141141

142142

143143
find_library(IPOPT_IPOPT_LIBRARY_RELEASE
144-
NAMES libipopt ipopt ipopt-3 ipopt-0 libipopt-3 libipopt-0
144+
NAMES libipopt ipopt ipopt.dll ipopt-3 ipopt-0 libipopt-3 libipopt-0
145145
HINTS ${IPOPT_DIR}/lib)
146146

147147
select_library_configurations(IPOPT_IPOPT)

0 commit comments

Comments
 (0)