Merge remote-tracking branch 'origin/v9-minor'

scipopt · Jul 19, 2024 · 1234b18 · 1234b18
2 parents f06254b + 12ed15c
commit 1234b18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -156,6 +156,8 @@ Build system
 
 ### Cmake
 
+- 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`.
+
 ### Makefile
 
 Miscellaneous

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -565,12 +565,11 @@ else()
 endif()
 
 if(HIGHS_FOUND)
-    include_directories(${HIGHS_INCLUDE_DIRS})
     if(LPS STREQUAL "highs")
         set(lpi lpi/lpi_highs.cpp)
     endif()
-    set(LPS_LIBRARIES ${LPS_LIBRARIES} ${HIGHS_LIBRARIES} Threads::Threads)
-    set(LPS_PIC_LIBRARIES ${LPS_PIC_LIBRARIES} ${HIGHS_LIBRARIES} Threads::Threads)
+    set(LPS_LIBRARIES ${LPS_LIBRARIES} highs::highs)
+    set(LPS_PIC_LIBRARIES ${LPS_PIC_LIBRARIES} highs::highs)
     message(WARNING "EXPERIMENTAL: You are using the experimental HiGHS interface. Please report any issues on https://github.com/scipopt/scip.")
 endif()