From 2aab08784f7fc8bc8b6f30131f09720eebd3924e Mon Sep 17 00:00:00 2001
From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com>
Date: Fri, 22 Sep 2023 17:24:16 -0400
Subject: [PATCH] Fixed a few lingering issues with the Mac build

---
 buildscripts/build_hdf5.sh | 22 ++++++++++++++--------
 pyproject.toml             |  4 ++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/buildscripts/build_hdf5.sh b/buildscripts/build_hdf5.sh
index 43308cc5e..9653f7cd0 100755
--- a/buildscripts/build_hdf5.sh
+++ b/buildscripts/build_hdf5.sh
@@ -84,22 +84,28 @@ else
     SZIP_LIBRARY="${SZIP_ROOT}/lib/libsz.so"
 fi
 
-cmake -B build -C ./config/cmake/cacheinit.cmake -G Ninja \
-    -DCMAKE_INSTALL_PREFIX:PATH=${HDF5_ROOT} \
-    -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ" \
+ARGLIST="-DCMAKE_INSTALL_PREFIX:PATH=${HDF5_ROOT} \
+    -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=TGZ \
     -DBUILD_ZLIB_WITH_FETCHCONTENT:BOOL=ON \
     -DZLIB_USE_LOCALCONTENT:BOOL=OFF \
-    -DZLIB_TGZ_ORIGNAME:STRING="${ZLIB_TGZ_NAME}" \
-    -DZLIB_TGZ_ORIGPATH:STRING="${ZLIB_TGZ_ORIGPATH}" \
+    -DZLIB_TGZ_ORIGNAME:STRING=${ZLIB_TGZ_NAME} \
+    -DZLIB_TGZ_ORIGPATH:STRING=${ZLIB_TGZ_ORIGPATH} \
     -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON \
     -DBUILD_SZIP_WITH_FETCHCONTENT:BOOL=ON \
     -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF \
-    -DLIBAEC_TGZ_ORIGNAME:STRING="${LIBAEC_TGZ_NAME}" \
-    -DLIBAEC_TGZ_ORIGPATH:STRING="${LIBAEC_TGZ_ORIGPATH}" \
+    -DLIBAEC_TGZ_ORIGNAME:STRING=${LIBAEC_TGZ_NAME} \
+    -DLIBAEC_TGZ_ORIGPATH:STRING=${LIBAEC_TGZ_ORIGPATH} \
     -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=OFF \
     -DHDF5_BUILD_CPP_LIB:BOOL=OFF \
     -DHDF5_BUILD_FORTRAN:BOOL=OFF \
-    -DHDF5_BUILD_JAVA:BOOL=OFF  .
+    -DHDF5_BUILD_JAVA:BOOL=OFF"
+
+
+if [ $OS = "MacOSX" ]; then
+    ARGLIST="${ARGLIST} -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF"
+fi
+
+cmake -B build -C ./config/cmake/cacheinit.cmake -G Ninja ${ARGLIST} .
 
 cmake --build build -j${NPROC}
 if [ -w ${PREFIX} ]; then
diff --git a/pyproject.toml b/pyproject.toml
index be5fc1ed1..5412396b6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -81,8 +81,8 @@ HDF5_ROOT="${PREFIX}/HDF_Group/HDF5/1.14.2"
 HDF5_LIBDIR="${HDF5_ROOT}/lib"
 HDF5_INCLUDE_DIR="${HDF5_ROOT}/include"
 HDF5_PLUGIN_PATH="${HDF5_LIBDIR}/plugin"
-NCDIR="${PREFIX}/netCDF-C"
-NFDIR="${PREFIX}/netCDF-Fortran"
+NCDIR="${PREFIX}"
+NFDIR="${PREFIX}"
 NETCDF_FORTRAN_HOME="${NFDIR}"
 NETCDF_FORTRAN_INCLUDE="${NFDIR}/include"
 FC="$(command -v gfortran-12)"