From d507828bc02b39a281cfb1c688762916a98fa657 Mon Sep 17 00:00:00 2001
From: Matthias Walter <matthias@matthiaswalter.org>
Date: Fri, 5 Apr 2024 00:16:15 +0200
Subject: [PATCH 1/3] Fixed cmake import of HiGHS

---
 CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8890b93726..db675c6396 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -554,12 +554,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 Threads::Threads)
+    set(LPS_PIC_LIBRARIES ${LPS_PIC_LIBRARIES} highs::highs Threads::Threads)
     message(WARNING "EXPERIMENTAL: You are using the experimental HiGHS interface. Please report any issues on https://github.com/scipopt/scip.")
 endif()
 

From 7e6d8743dbf7f2c8bb70c15ee8afbc69dcb8d8cf Mon Sep 17 00:00:00 2001
From: Matthias Walter <matthias@matthiaswalter.org>
Date: Mon, 8 Jul 2024 22:53:39 +0200
Subject: [PATCH 2/3] Threads::Threads is automatically imported as dependency
 in HiGHS

- since v1.7.1
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db675c6396..5b59c562a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -557,8 +557,8 @@ if(HIGHS_FOUND)
     if(LPS STREQUAL "highs")
         set(lpi lpi/lpi_highs.cpp)
     endif()
-    set(LPS_LIBRARIES ${LPS_LIBRARIES} highs::highs Threads::Threads)
-    set(LPS_PIC_LIBRARIES ${LPS_PIC_LIBRARIES} highs::highs 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()
 

From d7f292f27028a060bbe611ae04845831f9ec4d70 Mon Sep 17 00:00:00 2001
From: Matthias Walter <matthias@matthiaswalter.org>
Date: Tue, 16 Jul 2024 10:27:00 +0200
Subject: [PATCH 3/3] Added a changelog entry to highlight the modified usage
 of -DHIGHS_DIR.

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3840864ba9..760448045a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,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