diff --git a/nix/build-all.py b/nix/build-all.py index 5f3a4b8fd2..6f5fe67197 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -129,7 +129,7 @@ PCRE_VERSION = "8.41" LIBXML2_VERSION = "2.13.8" SWIG_VERSION = "4.1.0" OPENCOLLADA_VERSION = "v1.6.68" -HDF5_VERSION = "1.13.0" +HDF5_VERSION = "1.13.1" GMP_VERSION = "6.2.1" MPFR_VERSION = "3.1.6" # latest is 4.1.0 diff --git a/win/build-deps.cmd b/win/build-deps.cmd index 8ed282d4e0..d1277c611d 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -177,8 +177,8 @@ echo. cd "%DEPS_DIR%" :: VERSIONS -set HDF5_VERSION=1.12.1 -set HDF5_VERSION_MAJOR=1.12 +:: Don't use HDF5 1.13.0, because it has a broken cmake package path. +set HDF5_VERSION=1_13_1 set OCCT_VERSION=7.8.1 :: NOTE If updating the default Python version, change PY_VER_MAJOR_MINOR accordingly in run-cmake.bat set PYTHON_VERSION=%PYTHON_VERSION% @@ -323,12 +323,13 @@ IF EXIST "%INSTALL_DIR%\%HDF5_INSTALL_NAME%" ( if "%ARCH_BITS%"=="64" set ARCH_BITS_64=64 call :DownloadFile ^ - http://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%HDF5_VERSION_MAJOR%/hdf5-%HDF5_VERSION%/src/%HDF5_CMAKE_ZIP% ^ + https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-%HDF5_VERSION%.zip ^ "%DEPS_DIR%" %HDF5_CMAKE_ZIP% IF NOT %ERRORLEVEL%==0 GOTO :Error call :ExtractArchive %HDF5_CMAKE_ZIP% "%DEPS_DIR%" "%DEPS_DIR%\hdf5-%HDF5_VERSION%" IF NOT %ERRORLEVEL%==0 GOTO :Error -pushd "%DEPS_DIR%\hdf5-%HDF5_VERSION%" +ren "%DEPS_DIR%\hdf5-hdf5-%HDF5_VERSION%" "hdf5-%HDF5_VERSION%" +pushd "%DEPENDENCY_DIR%" call :RunCMake -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%\%HDF5_INSTALL_NAME%" ^ -DHDF5_ENABLE_Z_LIB_SUPPORT=OFF -DBUILD_TESTING=OFF ^ -DHDF5_BUILD_TOOLS=OFF -DHDF5_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DHDF5_BUILD_UTILS=OFF ^