Changed how HIPO_USES_OPENBLAS and HIPO_USES_APPLEBLAS are configured, so that it works correctly when using BLAS_LIBRARIES.

Note that when using `BLAS_LIBRARIES`, the version number is not known unless you manually set `OpenBLAS_VERSON="x.x.x"`.

Author: mathgeekcoder

cmake/FindHipoDeps.cmake

@@ -14,32 +14,32 @@ set(BLAS_ROOT "" CACHE STRING "Root directory of BLAS or OpenBLAS")
 function(highs_configure_blas_target)
     set(HIGHS_BLAS_TARGET "" PARENT_SCOPE)
     set(HIGHS_BLAS_INCLUDE_DIRS "" PARENT_SCOPE)
-    set(HIGHS_BLAS_COMPILE_DEFINITION "" PARENT_SCOPE)
 
     if(APPLE)
-        set(HIGHS_BLAS_COMPILE_DEFINITION HIPO_USES_APPLE_BLAS PARENT_SCOPE)
     elseif(OpenBLAS_FOUND AND TARGET OpenBLAS::OpenBLAS)
         set(HIGHS_BLAS_TARGET OpenBLAS::OpenBLAS PARENT_SCOPE)
-        set(HIGHS_BLAS_COMPILE_DEFINITION HIPO_USES_OPENBLAS PARENT_SCOPE)
     elseif(OPENBLAS_LIB)
         set(HIGHS_BLAS_TARGET "${OPENBLAS_LIB}" PARENT_SCOPE)
         set(HIGHS_BLAS_INCLUDE_DIRS "${OPENBLAS_INCLUDE_DIR}" PARENT_SCOPE)
-        set(HIGHS_BLAS_COMPILE_DEFINITION HIPO_USES_OPENBLAS PARENT_SCOPE)
     elseif(TARGET BLAS::BLAS)
         set(HIGHS_BLAS_TARGET BLAS::BLAS PARENT_SCOPE)
     endif()
 endfunction()
 
 # set appropriate BLAS dependency licensing metadata
 function(highs_configure_blas_metadata)
+    set(HIGHS_BLAS_COMPILE_DEFINITION "" PARENT_SCOPE)
+
     if(APPLE)
         set(HIGHS_BLAS_VENDOR "Apple Accelerate" PARENT_SCOPE)
         set(HIGHS_BLAS_VERSION "${CMAKE_OSX_DEPLOYMENT_TARGET}" PARENT_SCOPE)
         set(HIGHS_BLAS_LICENSE "Apple SDK license" PARENT_SCOPE)
-    elseif(OpenBLAS_FOUND OR OPENBLAS_LIB)
+        set(HIGHS_BLAS_COMPILE_DEFINITION HIPO_USES_APPLE_BLAS PARENT_SCOPE)
+    elseif(OpenBLAS_FOUND OR OPENBLAS_LIB OR BLA_VENDOR MATCHES "OpenBLAS")
         set(HIGHS_BLAS_VENDOR OpenBLAS PARENT_SCOPE)
         set(HIGHS_BLAS_VERSION "${OpenBLAS_VERSION}" PARENT_SCOPE)
         set(HIGHS_BLAS_LICENSE BSD-3-Clause PARENT_SCOPE)
+        set(HIGHS_BLAS_COMPILE_DEFINITION HIPO_USES_OPENBLAS PARENT_SCOPE)
     elseif(BLA_VENDOR MATCHES "Intel|MKL")
         set(HIGHS_BLAS_VENDOR "Intel oneMKL" PARENT_SCOPE)
         set(HIGHS_BLAS_VERSION "${MKL_VERSION}" PARENT_SCOPE)
@@ -215,7 +215,6 @@ function(highs_configure_blas)
         set(OpenBLAS_FOUND TRUE)
         set(HIGHS_BLAS_TARGET ${_openblas_target})
         set(HIGHS_BLAS_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/_deps/openblas-src/include")
-        set(HIGHS_BLAS_COMPILE_DEFINITION HIPO_USES_OPENBLAS)
         highs_configure_blas_metadata()
 
         set(HIGHS_BLAS_CONFIGURED TRUE)