From 4611302da7fc7d0583e02f61f2858a418a9f2dde Mon Sep 17 00:00:00 2001
From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com>
Date: Wed, 20 Sep 2023 22:37:25 -0400
Subject: [PATCH] More tweaks to cmake files to try to get cross-platform
 consistency

---
 cmake/Modules/FindNETCDF_Fortran.cmake | 6 +++---
 pyproject.toml                         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/Modules/FindNETCDF_Fortran.cmake b/cmake/Modules/FindNETCDF_Fortran.cmake
index 3a0e648f5..7baec7972 100644
--- a/cmake/Modules/FindNETCDF_Fortran.cmake
+++ b/cmake/Modules/FindNETCDF_Fortran.cmake
@@ -121,7 +121,7 @@ ELSE ()
    ENDIF()
 ENDIF()
 
-FIND_LIBRARY(NFLIB 
+FIND_LIBRARY(NETCDF_FORTRAN_LIBRARY
    NAMES ${NETCDFF} 
    PATHS
       ${NFPREFIX_DIR}
@@ -133,7 +133,7 @@ FIND_LIBRARY(NFLIB
       ${CMAKE_LIBRARY_ARCHITECTURE} 
    REQUIRED
 )
-ADD_LIBRARY(NETCDF_FORTRAN_LIBRARY SHARED IMPORTED)
+ADD_LIBRARY(NETCDF_FORTRAN_LIBRARY UNKNOWN IMPORTED PUBLIC)
 IF (CMAKE_SYSTEM_NAME STREQUAL "Windows")
    # Get the DLL added in
    FIND_FILE(NFDLL
@@ -158,7 +158,7 @@ ELSE ()
                         )
 ENDIF()
  
-MESSAGE(STATUS "NetCDF-Fortran library: ${NFLIB}")
+MESSAGE(STATUS "NetCDF-Fortran library: ${NETCDF_FORTRAN_LIBRARY}")
 MESSAGE(STATUS "NetCDF-Fortran include directory: ${NETCDF_FORTRAN_INCLUDE_DIR}")
 
 SET(NETCDF_FORTRAN_FOUND TRUE)
diff --git a/pyproject.toml b/pyproject.toml
index a66de5da9..de06c6ce6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -73,7 +73,7 @@ LDFLAGS="-Wl,-rpath,${ROOT_DIR}/lib  -Wl,-no_compact_unwind -L${PREFIX}/lib -L${
 CPATH="/usr/local/include:${PREFIX}/include:${HOMEBREW_PREFIX}/include:${ROOT_DIR}/include"
 CPPFLAGS="-isystem ${PREFIX}/include -isystem /usr/local/include"
 LIBS="-lomp"
-FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch ${ARCH}"
+FCFLAGS="-mmacos-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch ${ARCH}"
 FFFLAGS="${FCFLAGS}"
 CFLAGS="${FCFLAGS} -Wno-deprecated-non-prototype -arch ${ARCH}"
 CXXFLAGS="${CFLAGS}"