From 36e75722a249a48f89e99a5d1de452a9e4ad78ad Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 11 Jun 2024 10:16:49 +0200
Subject: [PATCH] [ci] Fix for MKL container builds.
Follow-up on !5011.
---
scripts/cmake/GuixSetup.cmake | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/cmake/GuixSetup.cmake b/scripts/cmake/GuixSetup.cmake
index 07de8688845..c2b8f942fca 100644
--- a/scripts/cmake/GuixSetup.cmake
+++ b/scripts/cmake/GuixSetup.cmake
@@ -18,8 +18,9 @@ endif()
set(GUIX_BUILD ON CACHE BOOL "" FORCE)
set(OGS_BUILD_TESTING OFF CACHE BOOL "" FORCE) # TODO: not yet supported
-# TODO: create a newer eigen package:
-set(OGS_USE_EIGEN_UNSUPPORTED OFF CACHE BOOL "" FORCE)
+# When building with OGS_USE_MKL then add guix build parameter for newer eigen,
+# e.g.: --with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4
+set(OGS_USE_EIGEN_UNSUPPORTED ${OGS_USE_MKL} CACHE BOOL "" FORCE)
set(OGS_INSTALL_DEPENDENCIES OFF CACHE BOOL "" FORCE) # handled by guix
set(OGS_CPU_ARCHITECTURE OFF CACHE BOOL "" FORCE) # enables guix --tune
set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
--
GitLab