Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Removed libaec from build dependencies as it caused issues in mac builds
Browse files Browse the repository at this point in the history
  • Loading branch information
daminton committed Sep 25, 2023
1 parent 1b1186c commit e13383f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 81 deletions.
1 change: 0 additions & 1 deletion buildscripts/build_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ if ! command -v ninja &> /dev/null; then
fi
fi

${SCRIPT_DIR}/build_libaec.sh ${ARGS}
${SCRIPT_DIR}/build_zlib.sh ${ARGS}
${SCRIPT_DIR}/build_hdf5.sh ${ARGS}
${SCRIPT_DIR}/build_netcdf-c.sh ${ARGS}
Expand Down
10 changes: 1 addition & 9 deletions buildscripts/build_hdf5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
HDF5_VER="1_14_2"
PLUGIN_VER="1.14.0"
ZLIB_VER="1.3"
AEC_VER="1.0.6"

SCRIPT_DIR=$(realpath $(dirname $0))
set -a
Expand Down Expand Up @@ -71,19 +70,15 @@ printf "*********************************************************\n"
cd ${DEPENDENCY_DIR}/hdfsrc
ZLIB_TGZ_NAME="zlib-${ZLIB_VER}.tar.gz"
ZLIB_TGZ_ORIGPATH="https://github.com/madler/zlib/releases/download/v${ZLIB_VER}/"
LIBAEC_TGZ_NAME="libaec-${AEC_VER}.tar.gz"
LIBAEC_TGZ_ORIGPATH="https://github.com/MathisRosenhauer/libaec/releases/download/v${AEC_VER}/"
curl -L "https://github.com/HDFGroup/hdf5_plugins/archive/refs/tags/${PLUGIN_VER}.tar.gz" -o hdf5_plugins.tar.gz

HDF5_ROOT=${PREFIX}
ZLIB_ROOT=${PREFIX}
SZIP_ROOT=${PREFIX}
if [ $OS = "MacOSX" ]; then
ZLIB_LIBRARY="${ZLIB_ROOT}/lib/libz.dylib"
SZIP_LIBRARY="${SZIP_ROOT}/lib/libsz.dylib"
else
ZLIB_LIBRARY="${ZLIB_ROOT}/lib/libz.so"
SZIP_LIBRARY="${SZIP_ROOT}/lib/libsz.so"
fi

ARGLIST="-DCMAKE_INSTALL_PREFIX:PATH=${HDF5_ROOT} \
Expand All @@ -92,17 +87,14 @@ ARGLIST="-DCMAKE_INSTALL_PREFIX:PATH=${HDF5_ROOT} \
-DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY} \
-DZLIB_INCLUDE_DIR:PATH=${ZLIB_ROOT}/include \
-DZLIB_USE_EXTERNAL:BOOL=OFF \
-DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON \
-DSZIP_LIBRARY:FILEPATH=${SZIP_LIBRARY} \
-DSZIP_INCLUDE_DIR:PATH=${SZIP_ROOT}/include \
-DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
-DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=OFF \
-DHDF5_BUILD_CPP_LIB:BOOL=OFF \
-DHDF5_BUILD_FORTRAN:BOOL=OFF \
-DHDF5_BUILD_EXAMPLES:BOOL=ON \
-DBUILD_TESTING:BOOL=ON \
-DHDF5_BUILD_JAVA:BOOL=OFF"


if [ $OS = "MacOSX" ]; then
ARGLIST="${ARGLIST} -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF"
fi
Expand Down
71 changes: 0 additions & 71 deletions buildscripts/build_libaec.sh

This file was deleted.

0 comments on commit e13383f

Please sign in to comment.