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

Commit

Permalink
more updates attempting to get SHTOOLS built properly
Browse files Browse the repository at this point in the history
  • Loading branch information
daminton committed Jan 29, 2024
1 parent 59d6d2f commit 0fca3ca
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion buildscripts/set_environment_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CPATH="/usr/local/include:${PREFIX}/include:${HOMEBREW_PREFIX}/include:${ROOT_DI
CPPFLAGS="-isystem ${PREFIX}/include -isystem /usr/local/include -Xclang -fopenmp"
LIBS="-lomp"
CFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -Wno-deprecated-non-prototype -arch ${ARCH}"
FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -fno-underscoring"
FFFLAGS="${FCFLAGS}"
CFLAGS="${FCFLAGS} -Wno-deprecated-non-prototype"
CXXFLAGS="${CFLAGS}"
Expand All @@ -26,6 +26,7 @@ NETCDF_FORTRAN_HOME="${NFDIR}"
NETCDF_FORTRAN_INCLUDE="${NFDIR}/include"
FC="$(command -v gfortran-12)"
F77="${FC}"
F95="${FC}"
CC="/usr/bin/clang"
CXX="/usr/bin/clang++"
CPP="/usr/bin/cpp"
Expand Down
7 changes: 5 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ dependencies = [
'cython>=3.0',
'meson>=1.3',
'meson-python>=0.15',
'pyshtools==4.11.10'
'setuptools_scm',
'pyshtools>=4.11.10'
]

[project.urls]
Expand All @@ -63,7 +64,6 @@ requires = [
"sphinxext-rediraffe",
"sphinxext-opengraph",
"nbsphinx",
'meson-python>=0.15',
"ford"
]
build-backend = "scikit_build_core.build"
Expand Down Expand Up @@ -103,8 +103,10 @@ NCDIR="${PREFIX}"
NFDIR="${PREFIX}"
NETCDF_FORTRAN_HOME="${NFDIR}"
NETCDF_FORTRAN_INCLUDE="${NFDIR}/include"
SHTOOLS_HOME="${PREFIX}"
FC="$(command -v gfortran-12)"
F77="${FC}"
F95="${FC}"
CC="/usr/bin/clang"
CXX="/usr/bin/clang++"
CPP="/usr/bin/cpp"
Expand Down Expand Up @@ -134,6 +136,7 @@ LD_LIBRARY_PATH="${PREFIX}/lib:/project/lib:${HDF5_LIBDIR}"
CPATH="${PREFIX}/include:/project/include:${HDF5_INCLUDE_DIR}"
netCDF-Fortran_DIR="${PREFIX}/lib/cmake/netCDF"
HDF5_DIR="${HDF5_ROOT}/cmake"
SHTOOLS_HOME="${PREFIX}"
PATH="${HDF5_ROOT}/bin:${PATH}"
CMAKE_INSTALL_LIBDIR="lib"

Expand Down

0 comments on commit 0fca3ca

Please sign in to comment.