diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7dbf66f87..455e8e7876 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -393,19 +393,9 @@ if(MKLROOT)
     list(APPEND math_libs -lifcore)
   endif()
 else()
-  # In compatibility to builtin FindLAPACK.cmake before v3.5.4
-  if(DEFINED LAPACK_DIR)
-    string(APPEND CMAKE_PREFIX_PATH ";${LAPACK_DIR}")
-  endif()
-  if(DEFINED LAPACK_LIBRARY)
-    set(LAPACK_LIBRARIES ${LAPACK_LIBRARY})
-  endif()
-  if(DEFINED BLAS_DIR)
-    string(APPEND CMAKE_PREFIX_PATH ";${BLAS_DIR}")
-  endif()
 
   find_package(FFTW3 REQUIRED)
-  find_package(LAPACK REQUIRED)
+  find_package(Lapack REQUIRED)
   include_directories(${FFTW3_INCLUDE_DIRS})
   list(APPEND math_libs FFTW3::FFTW3 LAPACK::LAPACK BLAS::BLAS)
 
diff --git a/cmake/FindBlas.cmake b/cmake/FindBlas.cmake
new file mode 100644
index 0000000000..a3c7f75069
--- /dev/null
+++ b/cmake/FindBlas.cmake
@@ -0,0 +1,15 @@
+if(DEFINED BLAS_DIR)
+    string(APPEND CMAKE_PREFIX_PATH ";${BLAS_DIR}")
+endif()
+if(DEFINED BLAS_LIBRARY)
+    set(BLAS_LIBRARIES ${BLAS_LIBRARY})
+endif()
+
+find_package(BLAS REQUIRED)
+
+if(NOT TARGET BLAS::BLAS)
+    add_library(BLAS::BLAS UNKNOWN IMPORTED)
+    set_target_properties(BLAS::BLAS PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+	IMPORTED_LOCATION "${BLAS_LIBRARIES}")
+endif()
diff --git a/cmake/FindLapack.cmake b/cmake/FindLapack.cmake
new file mode 100644
index 0000000000..15c3976d64
--- /dev/null
+++ b/cmake/FindLapack.cmake
@@ -0,0 +1,17 @@
+# In compatibility to builtin FindLAPACK.cmake before v3.5.4
+if(DEFINED LAPACK_DIR)
+  string(APPEND CMAKE_PREFIX_PATH ";${LAPACK_DIR}")
+endif()
+if(DEFINED LAPACK_LIBRARY)
+  set(LAPACK_LIBRARIES ${LAPACK_LIBRARY})
+endif()
+
+find_package(Blas REQUIRED)
+find_package(LAPACK REQUIRED)
+
+if(NOT TARGET LAPACK::LAPACK)
+    add_library(LAPACK::LAPACK UNKNOWN IMPORTED)
+    set_target_properties(LAPACK::LAPACK PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+        IMPORTED_LOCATION "${LAPACK_LIBRARIES}")
+endif()