more tweaks to build script for Mac

MintonGroup · Aug 12, 2023 · 20abadb · 20abadb
1 parent 2f40ed0
commit 20abadb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/buildscripts/build_swiftest.sh b/buildscripts/build_swiftest.sh
@@ -44,8 +44,10 @@ case $COMPILER in
         ;;
     GNU-Mac)
         export FC=$HOMEBREW_PREFIX/bin/gfortran-13
-        export CC=$HOMEBREW_PREFIX/bin/gcc-13
-        export CXX=$HOMEBREW_PREFIX/bin/g++-13
+        #export CC=$HOMEBREW_PREFIX/bin/gcc-13
+        #xport CXX=$HOMEBREW_PREFIX/bin/g++-13
+        export CC=/usr/bin/clang
+        export CXX=/usr/bin/clang++
         ;;
     *)
         echo "Unknown compiler type: ${COMPILER}"

diff --git a/cmake/Modules/FindNETCDF.cmake b/cmake/Modules/FindNETCDF.cmake
@@ -8,10 +8,10 @@
 # If not, see: https://www.gnu.org/licenses. 
 
 # - Finds the NetCDF libraries 
-
-find_path(NETCDF_INCLUDE_DIR NAMES netcdf.mod HINTS ENV NETCDF_FORTRAN_HOME)
-find_library(NETCDF_FORTRAN_LIBRARY NAMES netcdff HINTS ENV NETCDF_FORTRAN_HOME)
-find_library(NETCDF_LIBRARY NAMES netcdf HINTS ENV NETCDF_FORTRAN_HOME)
+set(NETCDF_FORTRAN_HOME $ENV{NETCDF_FORTRAN_HOME} CACHE STRING "Value of NetCDF library home directory")
+find_path(NETCDF_INCLUDE_DIR NAMES netcdf.mod HINTS ENV NETCDF_FORTRAN_HOME PATH_SUFFIXES include)
+find_library(NETCDF_FORTRAN_LIBRARY NAMES netcdff HINTS ENV NETCDF_FORTRAN_HOME PATH_SUFFIXES lib)
+find_library(NETCDF_LIBRARY NAMES netcdf HINTS ENV NETCDF_FORTRAN_HOME PATH_SUFFIXES lib)
 
 set(NETCDF_FOUND TRUE)
 # Note for posterity: When building static libraries, NETCDF_FORTRAN_LIBRARY must come *before* NETCDF_LIBRARY. Otherwise you get a bunch of "undefined reference to" errors