Merge pull request #39 from polyfem/find-blas-lapack

Find BLAS and LAPACK if not using MKL
polyfem · Oct 4, 2023 · 2915048 · 2915048
2 parents 91f7e3a + b67ecc3
commit 2915048
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/cmake/recipes/blas.cmake b/cmake/recipes/blas.cmake
@@ -19,8 +19,11 @@ if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm64" OR "${CMAKE_OSX_ARCHITECTURES}" M
     # Use Accelerate on macOS M1
     set(BLA_VENDOR Apple)
     find_package(BLAS REQUIRED)
-else()
-    # Use MKL on other platforms
+elseif(POLYSOLVE_WITH_MKL)
+    # Use MKL if enabled
     include(mkl)
     add_library(BLAS::BLAS ALIAS mkl::mkl)
+else()
+    # otherwise find system version
+    find_package(BLAS REQUIRED)
 endif()
diff --git a/cmake/recipes/lapack.cmake b/cmake/recipes/lapack.cmake
@@ -19,8 +19,11 @@ if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm64" OR "${CMAKE_OSX_ARCHITECTURES}" M
     # Use Accelerate on macOS M1
     set(BLA_VENDOR Apple)
     find_package(LAPACK REQUIRED)
-else()
-    # Use MKL on other platforms
+elseif(POLYSOLVE_WITH_MKL)
+    # Use MKL if enabled
     include(mkl)
     add_library(LAPACK::LAPACK ALIAS mkl::mkl)
+else()
+    # otherwise find system version
+    find_package(LAPACK REQUIRED)
 endif()