diff --git a/buildscripts/build_dependencies.sh b/buildscripts/build_dependencies.sh index 23c923a89..719f1e8e2 100755 --- a/buildscripts/build_dependencies.sh +++ b/buildscripts/build_dependencies.sh @@ -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} diff --git a/buildscripts/build_hdf5.sh b/buildscripts/build_hdf5.sh index e7e63a20c..9863f33ed 100755 --- a/buildscripts/build_hdf5.sh +++ b/buildscripts/build_hdf5.sh @@ -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 @@ -71,8 +70,6 @@ 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} @@ -80,10 +77,8 @@ 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} \ @@ -92,9 +87,7 @@ 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 \ @@ -102,7 +95,6 @@ ARGLIST="-DCMAKE_INSTALL_PREFIX:PATH=${HDF5_ROOT} \ -DBUILD_TESTING:BOOL=ON \ -DHDF5_BUILD_JAVA:BOOL=OFF" - if [ $OS = "MacOSX" ]; then ARGLIST="${ARGLIST} -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF" fi diff --git a/buildscripts/build_libaec.sh b/buildscripts/build_libaec.sh deleted file mode 100755 index f8028448a..000000000 --- a/buildscripts/build_libaec.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash -# This script will build all of the dependency libraries needed by Swiftest. Builds the following from source: -# Zlib, hdf5, netcdf-c, netcdf-fortran -# -# Copyright 2023 - David Minton -# This file is part of Swiftest. -# Swiftest is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -# Swiftest is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# You should have received a copy of the GNU General Public License along with Swiftest. -# If not, see: https://www.gnu.org/licenses. -SCRIPT_DIR=$(realpath $(dirname $0)) -set -a -ARGS=$@ -. ${SCRIPT_DIR}/_build_getopts.sh ${ARGS} -. ${SCRIPT_DIR}/set_compilers.sh -# Get the OpenMP Libraries -if [ $OS = "MacOSX" ]; then - ${SCRIPT_DIR}/get_lomp.sh ${ARGS} -fi - -NPROC=$(nproc) - -printf "*********************************************************\n" -printf "* STARTING DEPENDENCY BUILD *\n" -printf "*********************************************************\n" -printf "Using ${OS} compilers:\nFC: ${FC}\nCC: ${CC}\nCXX: ${CXX}\n" -printf "Installing to ${PREFIX}\n" -printf "\n" - -AEC_VER="1.0.6" -LIBAEC_TGZ_NAME="libaec-${AEC_VER}.tar.gz" - -printf "*********************************************************\n" -printf "* FETCHING AEC SOURCE *\n" -printf "*********************************************************\n" -printf "Copying files to ${DEPENDENCY_DIR}\n" -mkdir -p ${DEPENDENCY_DIR} -if [ ! -d ${DEPENDENCY_DIR}/aec-${ZLIB_VER} ]; then - [ -d ${DEPENDENCY_DIR}/aec-* ] && rm -rf ${DEPENDENCY_DIR}/aec-* - - curl -L https://github.com/MathisRosenhauer/libaec/releases/download/v${AEC_VER}/${LIBAEC_TGZ_NAME}| tar xvz -C ${DEPENDENCY_DIR} -fi - -printf "*********************************************************\n" -printf "* BUILDING AEC LIBRARY *\n" -printf "*********************************************************\n" -printf "LIBS: ${LIBS}\n" -printf "CFLAGS: ${CFLAGS}\n" -printf "CPPFLAGS: ${CPPFLAGS}\n" -printf "CPATH: ${CPATH}\n" -printf "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}\n" -printf "LDFLAGS: ${LDFLAGS}\n" -printf "*********************************************************\n" - -cd ${DEPENDENCY_DIR}/libaec-* -mkdir build -cd build -cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_INSTALL_LIBDIR="lib" -cmake --build build -j${NPROC} -if [ -w ${PREFIX} ]; then - make install -else - sudo make install -fi - -if [ $? -ne 0 ]; then - printf "libaec could not be compiled.\n" - exit 1 -fi \ No newline at end of file