From 7523314d51eb1713d819d4d5232e39d6a6247f21 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 30 Mar 2023 00:52:41 -0700 Subject: [PATCH] Win: Activate ADIOS2, too --- .github/workflows/build.yml | 2 +- library_builders.bat | 7 +++---- library_builders.sh | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a0a29f9f1..32918a1112 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -145,7 +145,7 @@ jobs: # for the openPMD-api build, CMake shall search for # static dependencies of HDF5 and ADIOS1 (see setup.py) CIBW_ENVIRONMENT: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' ADIOS_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='ON' - CIBW_ENVIRONMENT_WINDOWS: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='OFF' CMAKE_PREFIX_PATH='C:/Program Files (x86)/ADIOS2;C:/Program Files (x86)/blosc;C:/Program Files (x86)/HDF5;C:/Program Files (x86)/ZFP;C:/Program Files (x86)/zlib' + CIBW_ENVIRONMENT_WINDOWS: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='ON' CMAKE_PREFIX_PATH='C:/Program Files (x86)/ADIOS2;C:/Program Files (x86)/blosc;C:/Program Files (x86)/HDF5;C:/Program Files (x86)/ZFP;C:/Program Files (x86)/zlib' # C++17 support in macOS 10.13+ (partial) and 10.14+ (std::visit) and 10.15+ (std::filesystem::path) # https://cibuildwheel.readthedocs.io/en/stable/cpp_standards/#macos-and-deployment-target-versions # arm64 Python interpreters are built with 11.0 diff --git a/library_builders.bat b/library_builders.bat index 4452ca40cd..383e2d13d1 100644 --- a/library_builders.bat +++ b/library_builders.bat @@ -71,7 +71,6 @@ exit /b 0 -DBUILD_SHARED=OFF ^ -DBUILD_STATIC=ON ^ -DBUILD_TESTS=OFF ^ - -DPREFER_EXTERNAL_ZLIB=ON ^ -DZLIB_USE_STATIC_LIBS=ON ^ -DDEACTIVATE_SNAPPY=ON if errorlevel 1 exit 1 @@ -194,7 +193,7 @@ call :install_buildessentials call :build_zlib :: build_bzip2 :: build_szip -::call :build_blosc -::call :build_zfp +call :build_blosc +call :build_zfp call :build_hdf5 -::call :build_adios2 +call :build_adios2 diff --git a/library_builders.sh b/library_builders.sh index 38c83888d2..6f7dba2ed1 100755 --- a/library_builders.sh +++ b/library_builders.sh @@ -192,7 +192,6 @@ function build_blosc { -DBUILD_BENCHMARKS=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} \ - -DPREFER_EXTERNAL_ZLIB=ON \ -DZLIB_USE_STATIC_LIBS=ON \ ../c-blosc-* make -j${CPU_COUNT}