From 45069796095a936380b192c5e3f19dd809baed3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=AA=20Xu=C3=A2n=20Tu=E1=BA=A5n=20Anh?=
 <tuananhcs94@gmail.com>
Date: Fri, 10 Sep 2021 19:03:31 +0700
Subject: [PATCH] add intel mkl search path (#2428)

---
 dlib/cmake_utils/find_blas.cmake | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlib/cmake_utils/find_blas.cmake b/dlib/cmake_utils/find_blas.cmake
index 806b93888..4c51cbd20 100644
--- a/dlib/cmake_utils/find_blas.cmake
+++ b/dlib/cmake_utils/find_blas.cmake
@@ -316,9 +316,12 @@ elseif(WIN32 AND NOT MINGW)
          "C:/Program Files/Intel/Composer XE/mkl/lib/intel64"
          "C:/Program Files/Intel/Composer XE/tbb/lib/intel64/vc14"
          "C:/Program Files/Intel/Composer XE/compiler/lib/intel64"
+         "C:/Program Files (x86)/Intel/oneAPI/mkl/*/lib/intel64"
+         "C:/Program Files (x86)/Intel/oneAPI/compiler/*/windows/compiler/lib/intel64_win"
          )
       set (mkl_redist_path
          "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/redist/intel64/compiler" 
+         "C:/Program Files (x86)/Intel/oneAPI/compiler/*/windows/redist/intel64_win/compiler"
          )
       find_library(mkl_intel  mkl_intel_lp64 ${mkl_search_path})
    else()
@@ -336,9 +339,13 @@ elseif(WIN32 AND NOT MINGW)
          "C:/Program Files/Intel/Composer XE/mkl/lib/ia32"
          "C:/Program Files/Intel/Composer XE/tbb/lib/ia32/vc14"
          "C:/Program Files/Intel/Composer XE/compiler/lib/ia32"
+         "C:/Program Files (x86)/Intel/oneAPI/mkl/*/lib/ia32"
+         "C:/Program Files (x86)/Intel/oneAPI/compiler/*/windows/compiler/lib/ia32_win"
+
          )
       set (mkl_redist_path
-         "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/redist/ia32/compiler" 
+         "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/redist/ia32/compiler"
+         "C:/Program Files (x86)/Intel/oneAPI/compiler/*/windows/redist/ia32_win/compiler"
          )
       find_library(mkl_intel  mkl_intel_c ${mkl_search_path})
    endif()
@@ -354,6 +361,7 @@ elseif(WIN32 AND NOT MINGW)
       "C:/Program Files (x86)/Intel/Composer XE/compiler/include"
       "C:/Program Files/Intel/Composer XE/mkl/include"
       "C:/Program Files/Intel/Composer XE/compiler/include"
+      "C:/Program Files (x86)/Intel/oneAPI/mkl/*/include"
       )
    find_path(mkl_include_dir mkl_version.h ${mkl_include_search_path})
    mark_as_advanced(mkl_include_dir)