From da68a38d4b022bce1137df819f7df5d2ef8e6926 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 30 Apr 2024 09:27:32 +0200
Subject: [PATCH 1/2] [cmake] Ignore another MKL path when building the
 package.

---
 scripts/cmake/packaging/PackagingDependencies.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/cmake/packaging/PackagingDependencies.cmake b/scripts/cmake/packaging/PackagingDependencies.cmake
index 83d9275d4b3..2c8f19c3fdc 100644
--- a/scripts/cmake/packaging/PackagingDependencies.cmake
+++ b/scripts/cmake/packaging/PackagingDependencies.cmake
@@ -37,7 +37,10 @@ install(
     RESOLVED_DEPENDENCIES_VAR _r_deps
     UNRESOLVED_DEPENDENCIES_VAR _u_deps
     PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" ${OGS_INSTALL_DEPENDENCIES_PRE_EXCLUDES}
-    POST_EXCLUDE_REGEXES ".*system32/.*\\.dll" "/usr/lib/libtbb.so.12" ${OGS_INSTALL_DEPENDENCIES_POST_EXCLUDES}
+    POST_EXCLUDE_REGEXES ".*system32/.*\\.dll"
+                         "/usr/lib/libtbb.so.12"
+                         "/opt/intel/oneapi/tbb/latest/lib/intel64/gcc4.8/libtbb.so.12"
+                         ${OGS_INSTALL_DEPENDENCIES_POST_EXCLUDES}
   )
   find_program(PATCHELF_TOOL patchelf)
   foreach(_lib ${_r_deps})

From f56ca77b5e8d74f16d662eeb752f08bf98887af9 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 30 Apr 2024 11:11:36 +0200
Subject: [PATCH 2/2] [cmake] Notebook tests are excluded on sanitizer preset!

Fix for an accidental change in
2abc5d5b0e53bb2dbabacec5661c62d2e165a35f.
---
 CMakePresets.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index f353743696d..0b94463cb33 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -351,9 +351,6 @@
       "filter": {
         "include": {
           "label": "default"
-        },
-        "exclude": {
-          "name": "nb-"
         }
       },
       "execution": {
@@ -437,7 +434,12 @@
       "configurePreset": "sanitizer",
       "inherits": [
         "release"
-      ]
+      ],
+      "filter": {
+        "exclude": {
+          "name": "nb-"
+        }
+      }
     }
   ]
 }