Skip to content

Commit

Permalink
ci: install blosc2 in windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
vicentebolea committed Mar 14, 2024
1 parent 3a12b46 commit d38b962
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 3 deletions.
4 changes: 2 additions & 2 deletions cmake/DetectOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ find_package(Threads REQUIRED)

# Blosc2
if(ADIOS2_USE_Blosc2 STREQUAL AUTO)
find_package(Blosc2 2.10.1 CONFIG QUIET)
find_package(Blosc2 2.10.1 QUIET)
elseif(ADIOS2_USE_Blosc2)
find_package(Blosc2 2.10.1 CONFIG)
find_package(Blosc2 2.10.1)
endif()
if(Blosc2_FOUND)
set(ADIOS2_HAVE_Blosc2 TRUE)
Expand Down
2 changes: 1 addition & 1 deletion cmake/adios2-config-common.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ endif()
if(NOT @BUILD_SHARED_LIBS@)
set(ADIOS2_HAVE_Blosc2 @ADIOS2_HAVE_Blosc2@)
if(ADIOS2_HAVE_Blosc2)
find_dependency(Blosc2 2.10.1 CONFIG)
find_dependency(Blosc2 2.10.1)
endif()

set(ADIOS2_HAVE_BZip2 @ADIOS2_HAVE_BZip2@)
Expand Down
1 change: 1 addition & 0 deletions scripts/ci/cmake/ci-win2022-vs2022-static-serial.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ADIOS2_USE_EXTERNAL_GTEST=OFF
BUILD_TESTING:BOOL=ON
ADIOS2_BUILD_EXAMPLES:BOOL=ON
ADIOS2_USE_Blosc2:BOOL=ON
ADIOS2_USE_Fortran:BOOL=OFF
ADIOS2_USE_MPI:BOOL=OFF
ADIOS2_USE_HDF5:STRING=OFF
Expand Down
10 changes: 10 additions & 0 deletions scripts/ci/gh-actions/windows-setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ Write-Host "::group::Installing NumPy"
pip install "numpy>=1.19"
Write-Host "::endgroup::"

$Env:Path += ";$Env:CONDA\condabin"
Write-Host "$Env:Path"
Write-Host "::group::Installing c-blosc2"
conda.bat init powershell
conda.bat init bash
conda.bat activate base
conda.bat install -y conda-forge::lz4-c
conda.bat install -y conda-forge::c-blosc2
Write-Host "::endgroup::"

if($Env:GH_YML_MATRIX_PARALLEL -eq "ompi")
{
# This is taken from the MSMPI VCPKG
Expand Down
5 changes: 5 additions & 0 deletions scripts/ci/setup-run/ci-Windows.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
C:/Miniconda/condabin/conda.bat activate base
ls C:/Miniconda/Library
export CMAKE_INCLUDE_PATH=C:/Miniconda/Library/include
export CMAKE_LIBRARY_PATH=C:/Miniconda/Library/lib

0 comments on commit d38b962

Please sign in to comment.