Merge branch 'linux-gui-fix' into 'master'

[ci] Fixes for gui-linux and notebook benchmarks See merge request ogs/ogs!4991
ufz · Apr 30, 2024 · aa6a490 · aa6a490
2 parents cb03f90 + f56ca77
commit aa6a490
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git 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-"
+        }
+      }
     }
   ]
 }
diff --git 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})