From 8adb4c31eec1b142ce3b93a30a5bd6ada2aae29c Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 4 Jun 2021 10:50:40 -0700 Subject: [PATCH] ADIOS: 2.6.0 -> 2.7.1 Add support for improved blosc support: https://github.com/ornladios/ADIOS2/pull/2592 --- library_builders.bat | 13 ++++--------- library_builders.sh | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/library_builders.bat b/library_builders.bat index 88e03b681b..49a13a9b96 100644 --- a/library_builders.bat +++ b/library_builders.bat @@ -16,16 +16,11 @@ exit /b 0 :build_adios2 if exist adios2-stamp exit /b 0 - curl -sLo adios2-2.6.0.zip ^ - https://github.com/ornladios/ADIOS2/archive/v2.6.0.zip - powershell Expand-Archive adios2-2.6.0.zip -DestinationPath dep-adios2 + curl -sLo adios2-2.7.1.zip ^ + https://github.com/ornladios/ADIOS2/archive/v2.7.1.zip + powershell Expand-Archive adios2-2.7.1.zip -DestinationPath dep-adios2 - :: Patch FindBlosc.cmake w/ ADIOS 2.6.0 - curl -sLo adios2-blosc.patch ^ - https://patch-diff.githubusercontent.com/raw/ornladios/ADIOS2/pull/2550.patch - python -m patch -p 1 -d dep-adios2/ADIOS2-2.6.0 adios2-blosc.patch - - cmake -S dep-adios2/ADIOS2-2.6.0 -B build-adios2 ^ + cmake -S dep-adios2/ADIOS2-2.7.1 -B build-adios2 ^ -DCMAKE_BUILD_TYPE=Release ^ -DBUILD_SHARED_LIBS=OFF ^ -DADIOS2_USE_MPI=OFF ^ diff --git a/library_builders.sh b/library_builders.sh index 9731a97f44..efef4cc4e3 100755 --- a/library_builders.sh +++ b/library_builders.sh @@ -79,8 +79,8 @@ function build_adios1 { function build_adios2 { if [ -e adios2-stamp ]; then return; fi - curl -sLo adios2-2.6.0.tar.gz \ - https://github.com/ornladios/ADIOS2/archive/v2.6.0.tar.gz + curl -sLo adios2-2.7.1.tar.gz \ + https://github.com/ornladios/ADIOS2/archive/v2.7.1.tar.gz file adios2*.tar.gz tar -xzf adios2*.tar.gz rm adios2*.tar.gz