blas order on windows

Author: galabovaa

cmake/FindHipoDeps.cmake

@@ -3,14 +3,26 @@ set(BLAS_ROOT "" CACHE STRING "Root directory of BLAS or OpenBLAS")
 message(STATUS "BLAS_ROOT is " ${BLAS_ROOT})
 
 if (WIN32)
-    find_package(OpenBLAS CONFIG REQUIRED)
+    if (NOT (BLAS_ROOT STREQUAL ""))
+        message(STATUS "Looking for blas in " ${BLAS_ROOT})
+        set(OpenBLAS_ROOT ${BLAS_ROOT})
+        find_package(OpenBLAS CONFIG NO_DEFAULT_PATH)
+
+        if(OpenBLAS_FOUND)
+            message(STATUS "OpenBLAS CMake config path: ${metis_DIR}")
+        else()
+            find_package(OpenBLAS CONFIG REQUIRED)
+            if(OpenBLAS_FOUND)
+                message(STATUS "OpenBLAS CMake config path: ${metis_DIR}")
+            endif()
+        endif()
     message(STATUS "OpenBLAS CMake config path: ${OpenBLAS_DIR}")
 elseif(NOT APPLE)
     # LINUX
 
     # If a BLAS install was specified try to use it first.
     if (NOT (BLAS_ROOT STREQUAL ""))
-        message(STATUS "Looking for blas CMake targets file in " ${BLAS_ROOT})
+        message(STATUS "Looking for blas in " ${BLAS_ROOT})
 
         find_library(OPENBLAS_LIB
             NAMES openblas

highs/CMakeLists.txt

@@ -179,7 +179,7 @@ else()
   # Optional HIPO
   if (HIPO)
 
-    target_include_directories(highs PRIVATE 
+    target_include_directories(highs PRIVATE
       $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/hipo>
       $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/hipo/auxiliary>
       $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/hipo/factorhighs>
@@ -190,8 +190,18 @@ else()
         target_link_libraries(highs "-framework Accelerate")
         target_compile_definitions(highs PRIVATE HIPO_USES_APPLE_BLAS)
     elseif(WIN32)
-        target_link_libraries(highs OpenBLAS::OpenBLAS)
-        target_compile_definitions(highs PRIVATE HIPO_USES_OPENBLAS)
+
+      if(TARGET OpenBLAS::OpenBLAS)
+          target_link_libraries(highs PRIVATE OpenBLAS::OpenBLAS)
+      elseif(DEFINED OPENBLAS_LIB)
+          message(STATUS "Linking against OpenBLAS via raw library: ${OPENBLAS_LIB}")
+          target_link_libraries(highs PRIVATE ${OPENBLAS_LIB})
+          target_include_directories(highs PRIVATE ${OPENBLAS_INCLUDE_DIR})
+      else()
+          message(FATAL_ERROR "OpenBLAS not found on Windows.")
+      endif()
+
+      target_compile_definitions(highs PRIVATE HIPO_USES_OPENBLAS)
     else() 
         # LINUX
         if(BLAS_LIB)