Merge branch 'develop' into fix_2308_demodel_nosbml

CMakeLists.txt

@@ -169,9 +169,35 @@ if(${BLAS} STREQUAL "MKL" OR DEFINED ENV{MKLROOT})
         -lmkl
         CACHE STRING "")
   endif()
-elseif(NOT DEFINED ENV{BLAS_LIBS} AND NOT DEFINED ENV{BLAS_CFLAGS})
+elseif(
+  NOT DEFINED ENV{BLAS_LIBS}
+  AND NOT DEFINED ENV{BLAS_CFLAGS}
+  AND NOT BLAS_FOUND)
   # if nothing is specified via environment variables, let's try FindBLAS
-  find_package(BLAS)
+  if($(CMAKE_VERSION) VERSION_GREATER_EQUAL 3.22)
+    set(BLA_SIZEOF_INTEGER 8)
+  endif()
+
+  if(APPLE AND (NOT DEFINED BLA_VENDOR OR BLA_VENDOR STREQUAL "All"))
+    set(BLA_VENDOR Apple)
+    find_package(BLAS)
+    if(BLAS_FOUND)
+      set_property(
+        TARGET BLAS::BLAS
+        APPEND
+        PROPERTY INTERFACE_COMPILE_DEFINITIONS ACCELERATE_NEW_LAPACK)
+      set_property(
+        TARGET BLAS::BLAS
+        APPEND
+        PROPERTY INTERFACE_COMPILE_DEFINITIONS ACCELERATE_LAPACK_ILP64)
+    else()
+      set(BLA_VENDOR "All")
+    endif()
+
+  endif()
+  if(NOT BLAS_FOUND)
+    find_package(BLAS)
+  endif()
   if(NOT BLAS_FOUND)
     # Nothing specified by the user and FindBLAS didn't find anything; let's try
     # if cblas is available on the system paths.

ThirdParty/SuiteSparse/.gitignore

@@ -127,6 +127,7 @@ CSparse/Tcov/cov.sort
 CSparse/Tcov/cover.out
 CSparse/Tcov/covs.out
 CSparse/Tcov/cs_*.c
+CSparse/Tcov/csparse_version.c
 CSparse/Tcov/cstcov_test
 CSparse/Tcov/*.out
 CSparse/Tcov/cs_demo1
@@ -138,6 +139,7 @@ CXSparse/Tcov/cov.sort
 CXSparse/Tcov/cover.out
 CXSparse/Tcov/covs.out
 CXSparse/Tcov/cs_*.c
+CXSparse/Tcov/cxsparse_version.c
 CXSparse/Tcov/*.out
 CXSparse/Tcov/cs_demo1_ci
 CXSparse/Tcov/cs_demo1_cl
@@ -168,7 +170,9 @@ SPQR/Tcov/gpu_results.txt
 SPQR/Tcov/gpuqrengine_demo
 SPQR/Tcov/qrdemo_gpu
 SPQR/Tcov/qrtest
+SPQR/Tcov/qrtest32
 SPQR/Tcov/qrtest_out.txt
+SPQR/Tcov/qrtest_out32.txt
 SPQR/Tcov/troll.m
 SPQR/Tcov/cov.out