From 9f0c8fc3569351010f3da2abe3d946304082a453 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 30 Nov 2023 17:59:34 -0800 Subject: [PATCH] Windows: More Blosc2 Updates --- .github/workflows/build.yml | 2 +- library_builders.bat | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c49bc4b55..784a667e6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,7 +114,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='ON' CMAKE_PREFIX_PATH='C:/Program Files (x86)/ADIOS2;C:/Program Files (x86)/blosc;C:/Program Files (x86)/blosc2;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)/blosc2;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/aarch64 (M1/M2) requires 11.0+ diff --git a/library_builders.bat b/library_builders.bat index 091e00f606..123dc8a001 100644 --- a/library_builders.bat +++ b/library_builders.bat @@ -23,6 +23,7 @@ exit /b 0 cmake -S dep-adios2/ADIOS2-2.9.2 -B build-adios2 ^ -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_INSTALL_PREFIX=%BUILD_PREFIX%/blosc2 ^ -DBUILD_SHARED_LIBS=OFF ^ -DBUILD_TESTING=OFF ^ -DADIOS2_USE_MPI=OFF ^ @@ -70,6 +71,7 @@ exit /b 0 cmake -S dep-blosc2/c-blosc2-2.11.1 -B build-blosc2 ^ -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON ^ -DBUILD_SHARED=OFF ^ -DBUILD_STATIC=ON ^ -DBUILD_BENCHMARKS=OFF ^