Windows: Reenable HDF5

ornladios/ADIOS2#2848 (comment)
regro-cf-autotick-bot · Apr 2, 2022 · e5bdeca · e5bdeca
1 parent 825f5a4
commit e5bdeca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -10,9 +10,6 @@ set CFLAGS=%CFLAGS% -DH5_BUILT_AS_DYNAMIC_LIB
 set CXXFLAGS=%CXXFLAGS% -DH5_BUILT_AS_DYNAMIC_LIB
 echo "%CXXFLAGS%"
 
-:: temporarily disable HDF5 1.12 on Windows:
-::   https://github.com/ornladios/ADIOS2/issues/2848#issuecomment-960463939
-
 cmake ^
     -S %SRC_DIR%                ^
     -B build                    ^
@@ -26,7 +23,7 @@ cmake ^
     -DADIOS2_USE_Blosc=ON       ^
     -DADIOS2_USE_BZip2=ON       ^
     -DADIOS2_USE_Fortran=OFF    ^
-    -DADIOS2_USE_HDF5=OFF       ^
+    -DADIOS2_USE_HDF5=ON        ^
     -DADIOS2_USE_PNG=ON         ^
     -DADIOS2_USE_Profiling=OFF  ^
     -DADIOS2_USE_Python=ON      ^

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -70,10 +70,8 @@ requirements:
     - libffi
     # need to list hdf5 twice to get version pinning from conda_build_config
     # and build pinning from {{ mpi_prefix }}
-    # temporarily disable HDF5 1.12 on Windows:
-    #   https://github.com/ornladios/ADIOS2/issues/2848#issuecomment-960463939
-    - hdf5  # [not win]
-    - hdf5  >=1.8.13 = {{ mpi_prefix }}_*  # [not win]
+    - hdf5
+    - hdf5  >=1.8.13 = {{ mpi_prefix }}_*
     # TODO: Could NOT find ZeroMQ (missing: ZeroMQ_LIBRARY) on Windows
     - zeromq >=4.1  # [not win]
     - bzip2