diff options
| author | pradeep <pradeep@arrayfire.com> | 2021-08-03 05:00:57 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 16:30:57 -0700 |
| commit | 1ecfc2b3a9450ba6ebf67b70f1f7c591bcf0c5f0 (patch) | |
| tree | a85c95aaf7fbee15583c2bb4ec3400b14f22ca30 /ports | |
| parent | 6b6b1e3b0b4af84da16297dd51fab9570b4b472d (diff) | |
| download | vcpkg-1ecfc2b3a9450ba6ebf67b70f1f7c591bcf0c5f0.tar.gz vcpkg-1ecfc2b3a9450ba6ebf67b70f1f7c591bcf0c5f0.zip | |
[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
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/intel-mkl/CONTROL | 3 | ||||
| -rw-r--r-- | ports/intel-mkl/portfile.cmake | 12 |
2 files changed, 12 insertions, 3 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:" |