Update

Author: odow

.github/julia/build_tarballs.jl

@@ -34,7 +34,7 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
     -DBUILD_SHARED_LIBS=${BUILD_SHARED} \
     -DZLIB_USE_STATIC_LIBS=${BUILD_STATIC} \
     -DHIPO=ON \
-    -DBLAS_ROOT="${prefix}" \
+    -DBLAS_LIBRARIES="${libdir}/libopenblas.${dlext}" \
     -DMETIS_ROOT=${prefix} \
     ..
 

cmake/FindHipoDeps.cmake

@@ -3,24 +3,14 @@
 option(BLAS_ROOT "Root directory of BLAS or OpenBLAS" "")
 message(STATUS "BLAS_ROOT is " ${BLAS_ROOT})
 
-find_library(OPENBLAS_LIB
-    NAMES openblas
-    PATHS "${BLAS_ROOT}/lib"
-    NO_DEFAULT_PATH)
+find_package(BLAS REQUIRED)
 
-if(OPENBLAS_LIB)
-    message("Found OpenBLAS library at ${OPENBLAS_LIB}")
-else(OPENBLAS_LIB)
-    find_library(BLAS_LIB
-        NAMES blas
-        REQUIRED
-        PATHS "${BLAS_ROOT}/lib"
-        NO_DEFAULT_PATH)
-    message("Found BLAS library at ${BLAS_LIB}")
-endif(OPENBLAS_LIB)
+if(BLAS_FOUND)
+    message(STATUS "Using BLAS library: ${BLAS_LIBRARIES}")
+    message(STATUS "BLAS include dirs: ${BLAS_INCLUDE_DIRS}")
+endif()
 
 # METIS
-
 option(METIS_ROOT "Root directory of METIS" "")
 message(STATUS "METIS_ROOT is " ${METIS_ROOT})
 

highs/CMakeLists.txt

@@ -178,33 +178,17 @@ else()
 
   # Optional HIPO
   if (HIPO)
-
     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>
       $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/hipo/ipm>
     )
-
-    if(APPLE)
-        target_link_libraries(highs "-framework Accelerate")
-        target_compile_definitions(highs PRIVATE HIPO_USES_APPLE_BLAS)
-    else()
-        # LINUX
-        if(BLAS_LIB)
-            target_link_libraries(highs "${BLAS_LIB}")
-        elseif(OPENBLAS_LIB)
-            target_link_libraries(highs "${OPENBLAS_LIB}")
-            target_compile_definitions(highs PRIVATE HIPO_USES_OPENBLAS)
-        else()
-            message(FATAL_ERROR "No BLAS library available")
-        endif(BLAS_LIB)
-    endif(APPLE)
+    target_link_libraries(highs ${BLAS_LIBRARIES})
     target_include_directories(highs PRIVATE "${METIS_PATH}")
     target_link_libraries(highs "${METIS_LIB}")
   endif()
 
-
   if(MSVC)
     list(APPEND highs_compile_opts
       "/bigobj" # Allow big object