From 9b2446799122a44df46a335adbff0c2b06f99c58 Mon Sep 17 00:00:00 2001 From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com> Date: Wed, 16 Aug 2023 18:17:55 -0400 Subject: [PATCH] Put back hdf5 library. --- buildscripts/build_dependencies.sh | 4 ++-- buildscripts/fetch_dependencies.sh | 4 ++-- pyproject.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildscripts/build_dependencies.sh b/buildscripts/build_dependencies.sh index 674756eee..9dc06fed2 100755 --- a/buildscripts/build_dependencies.sh +++ b/buildscripts/build_dependencies.sh @@ -53,8 +53,8 @@ printf "Using ${COMPILER} compilers:\nFC: ${FC}\nCC: ${CC}\nCXX: ${CXX}\n" printf "Installing to ${PREFIX}\n" printf "\n" -#${SCRIPT_DIR}/build_zlib.sh -c $COMPILER -p $PREFIX -#${SCRIPT_DIR}/build_hdf5.sh -c $COMPILER -p $PREFIX +${SCRIPT_DIR}/build_zlib.sh -c $COMPILER -p $PREFIX +${SCRIPT_DIR}/build_hdf5.sh -c $COMPILER -p $PREFIX ${SCRIPT_DIR}/build_netcdf-c.sh -c $COMPILER -p $PREFIX ${SCRIPT_DIR}/build_netcdf-fortran.sh -c $COMPILER -p $PREFIX diff --git a/buildscripts/fetch_dependencies.sh b/buildscripts/fetch_dependencies.sh index e9dd38256..f0e615633 100755 --- a/buildscripts/fetch_dependencies.sh +++ b/buildscripts/fetch_dependencies.sh @@ -32,7 +32,7 @@ done mkdir -p ${DOWNLOAD_DIR} cd $DOWNLOAD_DIR -#wget -qO- https://www.zlib.net/zlib-1.2.13.tar.gz | tar xvz -#wget -qO- https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.1/src/hdf5-1.14.1-2.tar.gz | tar xvz +wget -qO- https://www.zlib.net/zlib-1.2.13.tar.gz | tar xvz +wget -qO- https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.1/src/hdf5-1.14.1-2.tar.gz | tar xvz wget -qO- https://github.com/Unidata/netcdf-c/archive/refs/tags/v4.9.2.tar.gz | tar xvz wget -qO- https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.6.1.tar.gz | tar xvz diff --git a/pyproject.toml b/pyproject.toml index c5f4e4cd2..f0ba23eaa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta" [tool.cibuildwheel.linux] environment = {SKBUILD_CONFIGURE_OPTIONS="-DBUILD_SHARED_LIBS=OFF", FFLAGS="${FFLAGS} -fPIC"} before-all = [ - "yum install wget m4 doxygen hdf5-static -y", + "yum install wget m4 doxygen -y", "buildscripts/fetch_dependencies.sh -d build", "buildscripts/build_dependencies.sh -c GNU-Linux -p /usr/local" ]