Update

Author: odow

.github/workflows/hipo.yml

@@ -51,20 +51,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: |
-          mkdir installs
-          curl -L -o installs/METIS.tar.gz `
-            "https://github.com/JuliaBinaryWrappers/METIS_jll.jl/releases/download/METIS-v5.1.3%2B0/METIS.v5.1.3.x86_64-w64-mingw32.tar.gz"
-          tar -xzf installs/METIS.tar.gz -C installs
           vcpkg install openblas[threads]
-          ls C:/vcpkg/installed
+          vcpkg install metis
           cmake -E make_directory build
           cd build
           cmake `
             -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} `
             -DALL_TESTS=${{ matrix.all_tests }} `
             -DHIPO=ON `
-            -DBLAS_ROOT=C:/vcpkg/installed/x64-windows `
-            -DMETIS_ROOT=installs `
+            -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake `
             ..
           cmake --build . --parallel --config ${{ matrix.build_type }}
           ctest -C ${{ matrix.build_type }} --timeout 300 --output-on-failure --no-tests=error

.github/workflows/julia-tests.yml

@@ -100,7 +100,7 @@ jobs:
           m = match(r"git-tree-sha1 = \"(.+?)\"", read(file, String))
           dir = escape_string(joinpath(ENV["GITHUB_WORKSPACE"], "products"))
           write(
-            joinpath(expanduser("~"), ".julia", "artifacts", "Overrides.toml"),
+            joinpath(homedir(), ".julia", "artifacts", "Overrides.toml"),
             "$(m[1]) = \"$(dir)\"\n",
           )
           Pkg.develop(; path = joinpath(ENV["GITHUB_WORKSPACE"], "HiGHS_jll"))

cmake/FindHipoDeps.cmake

@@ -1,8 +1,5 @@
 # BLAS
 
-option(BLAS_ROOT "Root directory of BLAS or OpenBLAS" "")
-message(STATUS "BLAS_ROOT is " ${BLAS_ROOT})
-
 find_package(BLAS REQUIRED)
 
 if(BLAS_FOUND)
@@ -14,18 +11,24 @@ endif()
 option(METIS_ROOT "Root directory of METIS" "")
 message(STATUS "METIS_ROOT is " ${METIS_ROOT})
 
-find_path(METIS_PATH
-    NAMES "metis.h"
-    REQUIRED
-    PATHS "${METIS_ROOT}/include"
-    NO_DEFAULT_PATH)
+find_package(metis CONFIG)
+
+if(METIS_FOUND)
+    message(STATUS "metis CMake config path: ${metis_DIR}")
+else()
+    find_path(METIS_PATH
+        NAMES "metis.h"
+        REQUIRED
+        PATHS "${METIS_ROOT}/include"
+        NO_DEFAULT_PATH)
 
-message("Found Metis header at ${METIS_PATH}")
+    message("Found Metis header at ${METIS_PATH}")
 
-find_library(METIS_LIB
-    NAMES metis libmetis
-    REQUIRED
-    PATHS "${METIS_ROOT}/lib" "${METIS_ROOT}/bin"
-    NO_DEFAULT_PATH)
+    find_library(METIS_LIB
+        NAMES metis libmetis
+        REQUIRED
+        PATHS "${METIS_ROOT}/lib" "${METIS_ROOT}/bin"
+        NO_DEFAULT_PATH)
 
-message("Found Metis library at ${METIS_LIB}")
+    message("Found Metis library at ${METIS_LIB}")
+endif()

highs/CMakeLists.txt

@@ -184,9 +184,13 @@ else()
       $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/hipo/factorhighs>
       $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/hipo/ipm>
     )
-    target_link_libraries(highs ${BLAS_LIBRARIES})
-    target_include_directories(highs PRIVATE "${METIS_PATH}")
-    target_link_libraries(highs "${METIS_LIB}")
+    target_link_libraries(highs BLAS::BLAS)
+    if(METIS_FOUND)
+      target_link_libraries(highs PRIVATE metis::metis)
+    else()
+      target_include_directories(highs PRIVATE "${METIS_PATH}")
+      target_link_libraries(highs "${METIS_LIB}")
+    endif()
   endif()
 
   if(MSVC)