From c510683364256d8e75139d14eb1971d893dd2f63 Mon Sep 17 00:00:00 2001
From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com>
Date: Sat, 23 Sep 2023 07:38:41 -0400
Subject: [PATCH] Ensured libraries get put in a consistent place for all
 builds

---
 buildscripts/build_hdf5.sh           |  2 +-
 buildscripts/build_libaec.sh         |  2 +-
 buildscripts/build_netcdf-c.sh       |  1 +
 buildscripts/build_netcdf-fortran.sh |  3 ++-
 buildscripts/build_zlib.sh           |  5 ++++-
 pyproject.toml                       | 22 ++++++++++++++++------
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/buildscripts/build_hdf5.sh b/buildscripts/build_hdf5.sh
index 9653f7cd0..36484b473 100755
--- a/buildscripts/build_hdf5.sh
+++ b/buildscripts/build_hdf5.sh
@@ -73,7 +73,7 @@ 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}/"
 
-HDF5_ROOT="${PREFIX}/HDF_Group/HDF5/1.14.2"
+HDF5_ROOT=${PREFIX}
 ZLIB_ROOT=${PREFIX}
 SZIP_ROOT=${PREFIX}
 if [ $OS = "MacOSX" ]; then
diff --git a/buildscripts/build_libaec.sh b/buildscripts/build_libaec.sh
index 8e2f4d0d2..50266c12e 100755
--- a/buildscripts/build_libaec.sh
+++ b/buildscripts/build_libaec.sh
@@ -55,7 +55,7 @@ printf "*********************************************************\n"
 cd ${DEPENDENCY_DIR}/libaec-*
 mkdir build
 cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX}
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_INSTALL_LIBDIR="lib"
 cmake --build build -j${NPROC}
 if [ -w ${PREFIX} ]; then
     make install
diff --git a/buildscripts/build_netcdf-c.sh b/buildscripts/build_netcdf-c.sh
index 3eafa0d7e..2973e25e1 100755
--- a/buildscripts/build_netcdf-c.sh
+++ b/buildscripts/build_netcdf-c.sh
@@ -66,6 +66,7 @@ cmake -B build -S . -G Ninja \
     -DENABLE_NCZARR_FILTER_TESTING:BOOL=OFF \
     -DENABLE_NCZARR_FILTERS_TESTING:BOOL=OFF \
     -DENABLE_LIBXML2:BOOL=OFF \
+    -DCMAKE_INSTALL_LIBDIR="lib"
 
 cmake --build build -j${NPROC} 
 if [ -w ${PREFIX} ]; then
diff --git a/buildscripts/build_netcdf-fortran.sh b/buildscripts/build_netcdf-fortran.sh
index 0f920a8e1..81afcc8ea 100755
--- a/buildscripts/build_netcdf-fortran.sh
+++ b/buildscripts/build_netcdf-fortran.sh
@@ -61,7 +61,8 @@ fi
 cmake -B build -S . -G Ninja \
     -DnetCDF_INCLUDE_DIR:PATH="${NCDIR}/include" \
     -DnetCDF_LIBRARIES:FILEPATH="${netCDF_LIBRARIES}"  \
-    -DCMAKE_INSTALL_PREFIX:PATH=${NFDIR}
+    -DCMAKE_INSTALL_PREFIX:PATH=${NFDIR} \
+    -DCMAKE_INSTALL_LIBDIR="lib"
 cmake --build build -j${NPROC} 
 if [ -w ${PREFIX} ]; then
     cmake --install build 
diff --git a/buildscripts/build_zlib.sh b/buildscripts/build_zlib.sh
index 93275a8e8..9c6b414fd 100755
--- a/buildscripts/build_zlib.sh
+++ b/buildscripts/build_zlib.sh
@@ -51,7 +51,10 @@ printf "LDFLAGS: ${LDFLAGS}\n"
 printf "*********************************************************\n"
 
 cd ${DEPENDENCY_DIR}/zlib-*
-cmake -B build -S . -G Ninja -DCMAKE_INSTALL_PREFIX=${PREFIX}
+cmake -B build -S . -G Ninja \
+    -DCMAKE_INSTALL_PREFIX=${PREFIX} \
+    -DCMAKE_INSTALL_LIBDIR="lib"
+    
 cmake --build build -j${NPROC}
 if [ -w ${PREFIX} ]; then
     cmake --install build 
diff --git a/pyproject.toml b/pyproject.toml
index 5412396b6..d8142f637 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -77,7 +77,7 @@ FCFLAGS="-mmacos-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch ${ARCH}"
 FFFLAGS="${FCFLAGS}"
 CFLAGS="${FCFLAGS} -Wno-deprecated-non-prototype -arch ${ARCH}"
 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"
@@ -107,11 +107,21 @@ before-all = [
     "buildscripts/build_dependencies.sh -p /usr/local"
 ]
 [tool.cibuildwheel.linux.environment]
-NETCDF_FORTRAN_HOME="/usr/local"
-NETCDF_INCLUDE="/usr/local/include"
-LD_LIBRARY_PATH="/usr/local/lib:/usr/local/lib64:/project/lib"
-CPATH="/usr/local/include:/project/include"
-netCDF-Fortran_DIR="/usr/local/lib64/cmake/netCDF"
+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:/project/lib:${HDF5_LIBDIR}"
+CPATH="${PREFIX}/include:/project/include:${HDF5_INCLUDE_DIR}"
+netCDF-Fortran_DIR="${PREFIX}/lib/cmake/netCDF"
+HDF5_DIR="${HDF5_ROOT}/cmake"
+PATH="${HDF5_ROOT}/bin:${PATH}"
+CMAKE_INSTALL_LIBDIR="lib"
 
 [[tool.scikit-build.generate]]
 path = "version.txt"