Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
More tweaks to cmake files to try to get cross-platform consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
MintoDA1 authored and MintoDA1 committed Sep 21, 2023
1 parent 9a628b5 commit 4611302
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions cmake/Modules/FindNETCDF_Fortran.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ ELSE ()
ENDIF()
ENDIF()

FIND_LIBRARY(NFLIB
FIND_LIBRARY(NETCDF_FORTRAN_LIBRARY
NAMES ${NETCDFF}
PATHS
${NFPREFIX_DIR}
Expand All @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit 4611302

Please sign in to comment.