Merge topic 'update-bloscs' into release

b36db380 dependencies: Add Blosc2 dependency

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Cory Quammen <cory.quammen@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !1138

.gitlab/artifacts.yml

@@ -36,6 +36,7 @@
 
             # CDash files.
             - build/DartConfiguration.tcl
+            - build/_CPack_Packages/win64/WIX/wix.log
 
 .cmake_package_artifacts:
     artifacts:

.gitlab/ci/configure_common.cmake

@@ -24,6 +24,7 @@ endfunction ()
 enable_project(adios2)
 enable_project(alembic)
 enable_project(blosc)
+enable_project(blosc2)
 enable_project(cosmotools)
 enable_project(exodus) # requires seacas to actually build anything
 enable_project(ffmpeg)

CMakeLists.txt

@@ -44,6 +44,7 @@ function (superbuild_find_projects var)
     adios2
     alembic
     blosc
+    blosc2
     boost
     bzip2
     catalyst

projects/adios2.cmake

@@ -22,7 +22,7 @@ superbuild_add_project(adios2
     # even if Python wrapping is disabled.
     python3
   DEPENDS_OPTIONAL
-    mpi blosc zfp png
+    mpi blosc2 zfp png
   LICENSE_FILES
     Copyright.txt
     LICENSE
@@ -33,7 +33,8 @@ superbuild_add_project(adios2
     -DBUILD_TESTING:BOOL=OFF
     -DADIOS2_BUILD_EXAMPLES:BOOL=OFF
     -DADIOS2_USE_BZip2:STRING=OFF
-    -DADIOS2_USE_Blosc:STRING=${blosc_enabled}
+    -DADIOS2_USE_Blosc2:STRING=${blosc2_enabled}
+    -DADIOS2_Blosc2_PREFER_SHARED:BOOL=${BUILD_SHARED_LIBS}
     -DADIOS2_USE_CUDA:BOOL=OFF
     -DADIOS2_USE_DataMan:STRING=OFF
     -DADIOS2_USE_Fortran:STRING=OFF

projects/blosc2.cmake

+set(blosc2_static_libs ON)
+if (BUILD_SHARED_LIBS)
+  set(blosc2_static_libs OFF)
+endif ()
+
+superbuild_add_project(blosc2
+  CAN_USE_SYSTEM
+  DEPENDS
+    zlib zstd
+  LICENSE_FILES
+    LICENSE.txt
+    LICENSES/LZ4.txt
+  SPDX_LICENSE_IDENTIFIER
+    "BSD-3-Clause AND BSD-2-Clause"
+  SPDX_COPYRIGHT_TEXT
+    "Copyright (c) 2009-2018 Francesc Alted <francesc@blosc.org>"
+    "Copyright (c) 2019-present The Blosc Development Team <blosc@blosc.org>"
+  CMAKE_ARGS
+    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+    -DCMAKE_INSTALL_LIBDIR:STRING=lib
+    -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
+    -DBUILD_SHARED:BOOL=${BUILD_SHARED_LIBS}
+    -DBUILD_STATIC:BOOL=${blosc2_static_libs}
+    -DBUILD_BENCHMARKS:BOOL=OFF
+    -DBUILD_EXAMPLES:BOOL=OFF
+    -DBUILD_FUZZERS:BOOL=OFF
+    -DBUILD_TESTS:BOOL=OFF
+    # good addition, but uses Makefiles: http://lz4.github.io/lz4/
+    -DDEACTIVATE_SNAPPY:BOOL=OFF
+    -DDEACTIVATE_ZLIB:BOOL=ON
+    -DDEACTIVATE_ZSTD:BOOL=ON
+    -DPREFER_EXTERNAL_LZ4:BOOL=OFF
+    -DPREFER_EXTERNAL_ZLIB:BOOL=${zlib_enabled}
+    -DPREFER_EXTERNAL_ZSTD:BOOL=${zstd_enabled})

projects/blosc2.system.cmake

+find_package(Blosc2 REQUIRED NO_MODULE)
+
+superbuild_add_extra_cmake_args(
+  -DBlosc2_DIR:PATH=${Blosc2_DIR})

versions.cmake

@@ -263,6 +263,11 @@ superbuild_set_revision(blosc
   URL     "https://www.paraview.org/files/dependencies/blosc-1.21.5.tar.gz"
   URL_MD5 "5097ee61dc1f25281811f5a55b91b2e4")
 
+superbuild_set_revision(blosc2
+  # https://github.com/Blosc/c-blosc2/releases
+  URL     "https://www.paraview.org/files/dependencies/c-blosc2-2.11.2.tar.gz"
+  URL_MD5 "4f5ae5148e9d724d8fecde4a4b7ce2d9")
+
 superbuild_set_revision(zfp
   # https://github.com/LLNL/zfp/releases
   URL     "https://www.paraview.org/files/dependencies/zfp-1.0.0.tar.gz"