Skip to content

Commit 12ed15c

Browse files
committed
Merge remote-tracking branch 'origin/v91-bugfix' into v9-minor
2 parents 13df56a + f379dbc commit 12ed15c

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
@@ -77,6 +77,8 @@ Build system
7777

7878
### Cmake
7979

80+
- 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`.
81+
8082
### Makefile
8183

8284
Miscellaneous

CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,12 +554,11 @@ else()
554554
endif()
555555

556556
if(HIGHS_FOUND)
557-
include_directories(${HIGHS_INCLUDE_DIRS})
558557
if(LPS STREQUAL "highs")
559558
set(lpi lpi/lpi_highs.cpp)
560559
endif()
561-
set(LPS_LIBRARIES ${LPS_LIBRARIES} ${HIGHS_LIBRARIES} Threads::Threads)
562-
set(LPS_PIC_LIBRARIES ${LPS_PIC_LIBRARIES} ${HIGHS_LIBRARIES} Threads::Threads)
560+
set(LPS_LIBRARIES ${LPS_LIBRARIES} highs::highs)
561+
set(LPS_PIC_LIBRARIES ${LPS_PIC_LIBRARIES} highs::highs)
563562
message(WARNING "EXPERIMENTAL: You are using the experimental HiGHS interface. Please report any issues on https://github.com/scipopt/scip.")
564563
endif()
565564

0 commit comments

Comments
 (0)