From 225bb040f63f8d87529274094e9a0964e52aafb2 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 24 Oct 2024 15:53:28 +0200
Subject: [PATCH] [cmake] Fix MKL finding on newer (2024) oneAPI versions.
---
scripts/ci/extends/vs2019-environment.yml | 2 +-
scripts/cmake/Find.cmake | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/ci/extends/vs2019-environment.yml b/scripts/ci/extends/vs2019-environment.yml
index fdcda29d0e7..6b6160282b5 100644
--- a/scripts/ci/extends/vs2019-environment.yml
+++ b/scripts/ci/extends/vs2019-environment.yml
@@ -1,6 +1,6 @@
.load_vs2019_env: &load_vs2019_env
- |
- pushd $env:VS160COMNTOOLS
+ pushd $env:VS170COMNTOOLS
cmd /c "VsDevCmd.bat -arch=amd64 -host_arch=amd64&set" |
foreach {
if ($_ -match "=") {
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 4af819824d8..0a557079664 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -77,6 +77,10 @@ if(OGS_USE_MKL)
if(APPLE)
set(_mac_ld_prefix "DY")
endif()
+ # newer MKLs define ONEAPI_ROOT
+ if(NOT DEFINED ENV{MKLROOT} AND DEFINED ENV{ONEAPI_ROOT})
+ set(ENV{MKLROOT} "$ENV{ONEAPI_ROOT}")
+ endif()
if(NOT GUIX_BUILD
AND (NOT DEFINED ENV{MKLROOT}
OR (NOT "$ENV{${_mac_ld_prefix}LD_LIBRARY_PATH}" MATCHES "intel"
--
GitLab