Skip to content

Commit 1234b18

Browse files
committed
Merge remote-tracking branch 'origin/v9-minor'
2 parents f06254b + 12ed15c commit 1234b18

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ Build system
156156

157157
### Cmake
158158

159+
- 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`.
160+
159161
### Makefile
160162

161163
Miscellaneous

CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -565,12 +565,11 @@ else()
565565
endif()
566566

567567
if(HIGHS_FOUND)
568-
include_directories(${HIGHS_INCLUDE_DIRS})
569568
if(LPS STREQUAL "highs")
570569
set(lpi lpi/lpi_highs.cpp)
571570
endif()
572-
set(LPS_LIBRARIES ${LPS_LIBRARIES} ${HIGHS_LIBRARIES} Threads::Threads)
573-
set(LPS_PIC_LIBRARIES ${LPS_PIC_LIBRARIES} ${HIGHS_LIBRARIES} Threads::Threads)
571+
set(LPS_LIBRARIES ${LPS_LIBRARIES} highs::highs)
572+
set(LPS_PIC_LIBRARIES ${LPS_PIC_LIBRARIES} highs::highs)
574573
message(WARNING "EXPERIMENTAL: You are using the experimental HiGHS interface. Please report any issues on https://github.com/scipopt/scip.")
575574
endif()
576575

0 commit comments

Comments
 (0)