Merge topic 'update-netcdf' into paraview/release

13e5abe2 Add changelog
8291c99b Merge branch 'upstream-netcdf' into update-netcdf
832b2075 netcdf 2024-11-22 (5ebf5132)
af14dd90 netcdf: update to for/vtk-20241123-4.9.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11655

Documentation/release/dev/netcdf-enable-cdf5.md

+## netcdf: Enable CDF5 format
+
+VTK's internal netcdf now enables the CDF5 format.

ThirdParty/netcdf/CMakeLists.txt

@@ -7,7 +7,7 @@ vtk_module_third_party(
     SPDX_COPYRIGHT_TEXT
       "Copyright 2018 Unidata"
     SPDX_DOWNLOAD_LOCATION
-      "git+https://gitlab.kitware.com/third-party/netcdf.git@for/vtk-20230505-4.9.2"
+      "git+https://gitlab.kitware.com/third-party/netcdf.git@for/vtk-20241123-4.9.2"
     VERSION
       "4.9.2"
     STANDARD_INCLUDE_DIRS

ThirdParty/netcdf/update.sh

@@ -8,7 +8,7 @@ readonly name="netcdf"
 readonly ownership="netcdf Upstream <kwrobot@kitware.com>"
 readonly subtree="ThirdParty/$name/vtk$name"
 readonly repo="https://gitlab.kitware.com/third-party/netcdf.git"
-readonly tag="for/vtk-20231030-4.9.2"
+readonly tag="for/vtk-20241123-4.9.2"
 readonly paths="
 include/*.h
 include/netcdf_dispatch.h.in

ThirdParty/netcdf/vtknetcdf/CMakeLists.txt

@@ -134,6 +134,25 @@ set(USE_PARALLEL_POSIX 0)
 set(USE_PNETCDF 0)
 set(USE_ZLIB 0)
 
+set(ENABLE_CDF5 ON)
+check_type_size("size_t" SIZEOF_SIZE_T)
+if (SIZEOF_SIZE_T EQUAL 4)
+  if (ENABLE_CDF5) # enable or auto
+    string(TOUPPER ${ENABLE_CDF5} ENABLE_CDF5)
+    if (ENABLE_CDF5 AND NOT ENABLE_CDF5 STREQUAL "AUTO") # explicitly enabled
+      message(STATUS "Unable to support CDF5 feature because size_t is less than 8 bytes")
+    endif ()
+    set(ENABLE_CDF5 OFF) # cannot support CDF5
+    set(USE_CDF5 OFF) # cannot support CDF5
+  endif ()
+else ()
+  if (ENABLE_CDF5) # explicitly set by user or not set
+    set(USE_CDF5 ON)
+  else () # explicitly disabled by user
+    set(USE_CDF5 OFF)
+  endif ()
+endif ()
+
 if (REGEDIT)
   list(APPEND sources
     libdispatch/dreg.c)