From b938f213f43d122336d72552092eb4cb1b6ada08 Mon Sep 17 00:00:00 2001 From: David Minton Date: Sat, 23 Sep 2023 08:44:23 -0400 Subject: [PATCH] Adjustments to build scripts --- buildscripts/build_hdf5.sh | 1 + buildscripts/build_netcdf-c.sh | 1 + buildscripts/set_environment.sh | 2 +- buildscripts/set_environment_linux.sh | 17 +++++++++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100755 buildscripts/set_environment_linux.sh diff --git a/buildscripts/build_hdf5.sh b/buildscripts/build_hdf5.sh index 36484b473..35773e427 100755 --- a/buildscripts/build_hdf5.sh +++ b/buildscripts/build_hdf5.sh @@ -85,6 +85,7 @@ else fi ARGLIST="-DCMAKE_INSTALL_PREFIX:PATH=${HDF5_ROOT} \ + -DCMAKE_BUILD_TYPE:STRING="Release" \ -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=TGZ \ -DBUILD_ZLIB_WITH_FETCHCONTENT:BOOL=ON \ -DZLIB_USE_LOCALCONTENT:BOOL=OFF \ diff --git a/buildscripts/build_netcdf-c.sh b/buildscripts/build_netcdf-c.sh index 2973e25e1..76a7ce794 100755 --- a/buildscripts/build_netcdf-c.sh +++ b/buildscripts/build_netcdf-c.sh @@ -58,6 +58,7 @@ ZLIB_ROOT=${PREFIX} cmake -B build -S . -G Ninja \ -DCMAKE_BUILD_TYPE:STRING="Release" \ -DHDF5_DIR:PATH=${HDF5_ROOT}/cmake \ + -DHDF5_ROOT:PATH=${HDF5_ROOT} \ -DCMAKE_INSTALL_PREFIX:STRING="${NCDIR}" \ -DENABLE_DAP:BOOL=OFF \ -DENABLE_BYTERANGE:BOOL=OFF \ diff --git a/buildscripts/set_environment.sh b/buildscripts/set_environment.sh index bf1775978..cd51f1865 100755 --- a/buildscripts/set_environment.sh +++ b/buildscripts/set_environment.sh @@ -16,7 +16,7 @@ FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" FFFLAGS="${FCFLAGS}" CFLAGS="${FCFLAGS} -Wno-deprecated-non-prototype" CXXFLAGS="${CFLAGS}" -HDF5_ROOT="${PREFIX}/HDF_Group/HDF5/1.14.2" +HDF5_ROOT="${PREFIX}" HDF5_LIBDIR="${HDF5_ROOT}/lib" HDF5_INCLUDE_DIR="${HDF5_ROOT}/include" HDF5_PLUGIN_PATH="${HDF5_LIBDIR}/plugin" diff --git a/buildscripts/set_environment_linux.sh b/buildscripts/set_environment_linux.sh new file mode 100755 index 000000000..a7c566d59 --- /dev/null +++ b/buildscripts/set_environment_linux.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# Sets environment flags on Linux +set -a +PREFIX="/usr/local" +NCDIR="${PREFIX}" +NFDIR="${PREFIX}" +NETCDF_FORTRAN_HOME="${NFDIR}" +NETCDF_FORTRAN_INCLUDE="${NFDIR}/include" +HDF5_ROOT="${PREFIX}" +HDF5_LIBDIR="${HDF5_ROOT}/lib" +HDF5_INCLUDE_DIR="${HDF5_ROOT}/include" +HDF5_PLUGIN_PATH="${HDF5_LIBDIR}/plugin" +LD_LIBRARY_PATH="${PREFIX}/lib" +CPATH="${PREFIX}/include:" +HDF5_DIR="${HDF5_ROOT}/cmake" +PATH="${HDF5_ROOT}/bin:${PATH}" +CMAKE_INSTALL_LIBDIR="lib" \ No newline at end of file