From 1ecfc2b3a9450ba6ebf67b70f1f7c591bcf0c5f0 Mon Sep 17 00:00:00 2001
From: pradeep <pradeep@arrayfire.com>
Date: Tue, 3 Aug 2021 05:00:57 +0530
Subject: [intel-mkl] Lookup oneapi installation for mkl headers (#19296)

* [intel-mkl] Lookup oneapi installation for mkl headers

* [intel-mkl] Increment port version for oneMKL related change

* [intel-mkl] Update version
---
 ports/intel-mkl/CONTROL        |  3 ++-
 ports/intel-mkl/portfile.cmake | 12 ++++++++++--
 versions/baseline.json         |  2 +-
 versions/i-/intel-mkl.json     |  5 +++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ports/intel-mkl/CONTROL b/ports/intel-mkl/CONTROL
index 0286f25de..a54d24e50 100644
--- a/ports/intel-mkl/CONTROL
+++ b/ports/intel-mkl/CONTROL
@@ -1,3 +1,4 @@
 Source: intel-mkl
 Version: 2020.0.0
-Description: Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors. 
\ No newline at end of file
+Port-Version: 1
+Description: Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors. 
diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake
index 4e656948e..a885e8dcb 100644
--- a/ports/intel-mkl/portfile.cmake
+++ b/ports/intel-mkl/portfile.cmake
@@ -8,8 +8,16 @@ set(MKL_REQUIRED_VERSION "20200000")
 
 set(ProgramFilesx86 "ProgramFiles(x86)")
 set(INTEL_ROOT $ENV{${ProgramFilesx86}}/IntelSWTools/compilers_and_libraries/windows)
-
-find_path(MKL_ROOT include/mkl.h PATHS $ENV{MKLROOT} ${INTEL_ROOT}/mkl DOC "Folder contains MKL")
+set(ONEMKL_ROOT $ENV{${ProgramFilesx86}}/Intel/oneAPI/mkl/latest)
+
+find_path(MKL_ROOT include/mkl.h
+    PATHS
+    $ENV{MKLROOT}
+    ${INTEL_ROOT}/mkl
+    $ENV{ONEAPI_ROOT}/mkl/latest
+    ${ONEMKL_ROOT}
+    DOC
+    "Folder contains MKL")
 
 if (MKL_ROOT STREQUAL "MKL_ROOT-NOTFOUND")
     message(FATAL_ERROR "Could not find MKL. Before continuing, please download and install MKL  (${MKL_REQUIRED_VERSION} or higher) from:"
diff --git a/versions/baseline.json b/versions/baseline.json
index 7e6419146..6e204ecc7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2714,7 +2714,7 @@
     },
     "intel-mkl": {
       "baseline": "2020.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "intelrdfpmathlib": {
       "baseline": "20U2-1",
diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json
index 36b7db4f2..e5e3bf186 100644
--- a/versions/i-/intel-mkl.json
+++ b/versions/i-/intel-mkl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1f91c30839fe3222faa4c81d978ae4f52f61a1df",
+      "version-string": "2020.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "27543f95c3c01ee6993990c80b06217a1e2dd9fe",
       "version-string": "2020.0.0",
-- 
cgit v1.2.3