From 20abadb642a42e7a99379319636c72acf495b436 Mon Sep 17 00:00:00 2001 From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com> Date: Sat, 12 Aug 2023 09:22:32 -0400 Subject: [PATCH] more tweaks to build script for Mac --- buildscripts/build_swiftest.sh | 6 ++++-- cmake/Modules/FindNETCDF.cmake | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/buildscripts/build_swiftest.sh b/buildscripts/build_swiftest.sh index 9e469e9fe..8a817bdea 100755 --- 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 index 5ba87662e..51a607633 100644 --- 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