.gitlab-ci.yml

@@ -133,7 +133,7 @@ macos-x86_64:build:
         - .macos_x86_64
         - .cmake_build_macos
         - .cmake_build_artifacts
-        - .macos_builder_tags
+        - .macos_x86_64_builder_tags
         - .run_manually
     timeout: 3 hours
 
@@ -142,7 +142,7 @@ macos-x86_64:test:
         - .macos_x86_64
         - .cmake_test_macos
         - .cmake_package_artifacts
-        - .macos_builder_tags_test
+        - .macos_x86_64_builder_tags_test
         - .run_automatically
     needs:
         - macos-x86_64:build

.gitlab/ci/configure_common.cmake

@@ -49,6 +49,7 @@ enable_project(occt)
 enable_project(openimagedenoise)
 enable_project(openmp)
 enable_project(openpmd)
+enable_project(openturns)
 enable_project(openvdb)
 enable_project(osmesa)
 enable_project(ospray)

.gitlab/ci/configure_linux_shared.cmake

@@ -4,7 +4,6 @@ set(ENABLE_catalyst ON  CACHE BOOL "")
 set(ENABLE_lookingglass ON  CACHE BOOL "")
 set(ENABLE_fides ON CACHE BOOL "")
 set(ENABLE_nvidiaoptix ON CACHE BOOL "")
-set(ENABLE_openturns ON CACHE BOOL "")
 set(ENABLE_paraviewtranslations ON CACHE BOOL "")
 set(ENABLE_visrtx ON CACHE BOOL "")
 set(ENABLE_openxrsdk ON CACHE BOOL "")

.gitlab/ci/configure_linux_static.cmake

@@ -9,7 +9,6 @@ set(llvm_BUILD_SHARED_LIBS        "OFF" CACHE STRING "")
 set(ENABLE_ttk OFF CACHE BOOL "")
 
 set(ENABLE_catalyst                 ON  CACHE BOOL "")
-set(ENABLE_openturns                ON  CACHE BOOL "")
 
 set(ENABLE_mesa                     OFF CACHE BOOL "")
 set(ENABLE_nvidiaindex              OFF CACHE BOOL "")

.gitlab/os-macos.yml

@@ -8,7 +8,7 @@
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/paraview-ci-ext/$CI_CONCURRENT_ID"
         # TODO: Factor this out so that each job selects the Xcode version to
         # use so that different versions can be tested in a single pipeline.
-        DEVELOPER_DIR: "/Applications/Xcode-14.2.app/Contents/Developer"
+        DEVELOPER_DIR: "/Applications/Xcode-16.1.app/Contents/Developer"
 
 ### Build and test
 
@@ -37,12 +37,12 @@
 
 ## Tags
 
-.macos_builder_tags:
+.macos_x86_64_builder_tags:
     tags:
         - paraview
         - macos-x86_64
         - shell
-        - xcode-14.2
+        - xcode-16.1
         - nonconcurrent
         - finder
 
@@ -51,16 +51,16 @@
         - paraview
         - macos-arm64
         - shell
-        - xcode-14.2
+        - xcode-16.1
         - nonconcurrent
         - finder
 
-.macos_builder_tags_test:
+.macos_x86_64_builder_tags_test:
     tags:
         - paraview
         - macos-x86_64
         - shell
-        - xcode-14.2
+        - xcode-16.1
         - nonconcurrent
 
 .macos_arm64_builder_tags_test:
@@ -68,7 +68,7 @@
         - paraview
         - macos-arm64
         - shell
-        - xcode-14.2
+        - xcode-16.1
         - nonconcurrent
 
 ## macOS-specific scripts

CMakeLists.txt

@@ -69,6 +69,7 @@ function (superbuild_find_projects var)
     ispc
     jsonc
     jsoncpp
+    lapack
     las
     libjpegturbo
     lookingglass
@@ -89,6 +90,7 @@ function (superbuild_find_projects var)
     openvkl
     ospray
     ospraymodulempi
+    openturns
     openxrmodels
     openxrsdk
     paraviewtranslations
@@ -196,7 +198,6 @@ function (superbuild_find_projects var)
       fortran
       genericio
       gmsh
-      lapack
       libxml2
       mili
       rapidjson
@@ -214,7 +215,7 @@ function (superbuild_find_projects var)
         libusb
         llvm
         mesa
-        openturns
+        mesatoolchainoverride
         osmesa
         paraviewsdk
         socat
@@ -545,6 +546,11 @@ set(_python_unicode_default "UCS4")
 # and thinking things went wrong.
 set(_superbuild_suppress_matplotlib_output ON)
 
+# This optional hdf5 dependencies should not be added
+# as it conflicts with mpi, ignore it instead
+set(_superbuild_ignored_optional_depends
+  hdf5cpp)
+
 # Setup SPDX superbuild variables
 set(superbuild_spdx_document_namespace "https://paraview.org/spdx")
 

projects/apple-unix/gmsh.cmake

@@ -13,5 +13,3 @@ superbuild_add_project(gmsh
     -DENABLE_ONELAB:BOOL=OFF
     -DENABLE_ONELAB_METAMODEL:BOOL=OFF
     -DENABLE_BUILD_SHARED:BOOL=${BUILD_SHARED_LIBS})
-
-superbuild_apply_patch(gmsh stdint-includes "Missing stdint.h include")

projects/apple-unix/patches/gmsh-stdint-includes.patch

-diff -u -Nr -U5 gmsh-4.11.1-source/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h gmsh-4.11.1-source.stdint-includes/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
---- gmsh-4.11.1-source/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h	2022-09-28 14:00:54.000000000 -0400
-+++ gmsh-4.11.1-source.stdint-includes/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h	2023-08-24 14:56:47.762340361 -0400
-@@ -6,10 +6,11 @@
- // Author: Maxence Reberol
- 
- #pragma once
- 
- #include <float.h>
-+#include <stdint.h>
- #include "qmtMeshUtils.h"
- 
- class SurfaceProjector;
- 
- /**
-diff -u -Nr -U5 gmsh-4.11.1-source/src/mesh/meshGFacePack.cpp gmsh-4.11.1-source.stdint-includes/src/mesh/meshGFacePack.cpp
---- gmsh-4.11.1-source/src/mesh/meshGFacePack.cpp	2022-09-28 14:01:00.000000000 -0400
-+++ gmsh-4.11.1-source.stdint-includes/src/mesh/meshGFacePack.cpp	2023-08-24 14:47:27.964129947 -0400
-@@ -1,10 +1,11 @@
- // Gmsh - Copyright (C) 1997-2022 C. Geuzaine, J.-F. Remacle
- //
- // See the LICENSE.txt file in the Gmsh root directory for license information.
- // Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
- 
-+#include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <queue>
- #include <map>
- #include <vector>

projects/paraview.cmake

@@ -44,7 +44,6 @@ if (UNIX)
       # OSMesa is only built to support users on bespoke linux systems that do not have an OSMesa library.
       # The OSMesa library/headers are not really required at compile time.
       osmesa
-      openturns
       openxrsdk
       zeromq
 
@@ -52,7 +51,7 @@ if (UNIX)
       fontconfig)
   endif ()
   list(APPEND paraview_platform_dependencies
-    cdi ffmpeg libxml2 freetype mili gmsh
+    cdi ffmpeg fides fortran libxml2 freetype mili gmsh
     # For cosmotools
     genericio cosmotools)
 endif ()
@@ -225,9 +224,10 @@ superbuild_add_project(paraview
   DEFAULT_ON
   DEPENDS cxx11
   DEPENDS_OPTIONAL
-    adios2 alembic catalyst cuda boost eigen fortran gdal hdf5 matplotlib mpi numpy pdal png
-    protobuf python3 qt5 visitbridge zlib silo las lookingglass fides pythonmpi4py
+    adios2 alembic catalyst cuda boost eigen gdal hdf5 matplotlib mpi numpy pdal png
+    protobuf python3 qt5 visitbridge zlib silo las lookingglass pythonmpi4py
     xdmf3 vrpn vtkm netcdf
+    openturns
     openmp
     openpmd
     openvdb

projects/unix/paraviewsdk.bundle.cmake

@@ -73,7 +73,7 @@ endif ()
 ############################################################
 
 # First, grab all the referenced targets from the CMake files
-file(GLOB_RECURSE cmake_files "${superbuild_install_location}/lib/cmake/paraview-${paraview_version}/*.cmake")
+file(GLOB_RECURSE cmake_files "${superbuild_install_location}/lib/cmake/paraview-${paraview_version}/*-targets-release.cmake")
 set(libraries_referenced_by_cmake)
 foreach (cmake_file IN LISTS cmake_files)
   file(STRINGS "${cmake_file}" lines REGEX "\\\${_IMPORT_PREFIX}[^;\\\">]+")

projects/win32/paraview.bundle.cmake

@@ -194,6 +194,18 @@ if (visrtx_enabled)
   endforeach ()
 endif ()
 
+if (lapack_enabled)
+  set(lapackextra_libraries
+    mkl_core.2
+    mkl_def.2)
+
+  foreach (lapackextra_library IN LISTS lapackextra_libraries)
+    superbuild_windows_install_plugin("${lapackextra_library}.dll"
+      "bin" "bin"
+      SEARCH_DIRECTORIES "${superbuild_install_location}/bin")
+  endforeach ()
+endif ()
+
 if (python3_enabled)
   if (python3_built_by_superbuild)
     include(python3.functions)

superbuild @ b93a514f

-Subproject commit 5456ac763b2bb4b586ee81fdcab50a47b19df40f
+Subproject commit b93a514fb29bf27e5ca7fba9e55146f78ab5064e

versions.cmake

@@ -147,8 +147,8 @@ endif()
 
 superbuild_set_revision(gmsh
   # https://gmsh.info/#Download
-  URL     "https://www.paraview.org/files/dependencies/gmsh-4.11.1-source.tgz"
-  URL_MD5 681ccfa83213921884ede92a80191ba2)
+  URL     "https://www.paraview.org/files/dependencies/gmsh-4.13.1-source.tgz"
+  URL_MD5 6c2f83e6ba8165aa862ee8c6fcedee99)
 
 if (WIN32)
   set(nvidiaindex_platform "windows-x64")