diff --git a/buildscripts/build_netcdf-fortran.sh b/buildscripts/build_netcdf-fortran.sh index 8214ed8fe..283e9aa66 100755 --- a/buildscripts/build_netcdf-fortran.sh +++ b/buildscripts/build_netcdf-fortran.sh @@ -52,10 +52,11 @@ printf "*********************************************************\n" cd ${DEPENDENCY_DIR}/netcdf-fortran-* +NCLIBDIR=$(${PREFIX}/bin/nc-config --libdir) if [ $OS = "MacOSX" ]; then - netCDF_LIBRARIES="${PREFIX}/lib/libnetcdf.dylib" + netCDF_LIBRARIES="${NCLIBDIR}/ibnetcdf.dylib" else - netCDF_LIBRARIES="${PREFIX}/lib/libnetcdf.so" + netCDF_LIBRARIES="${NCLIBDIR}/libnetcdf.so" fi cmake -B build -S . -G Ninja -DnetCDF_INCLUDE_DIR="${PREFIX}/include" -DnetCDF_LIBRARIES="${netCDF_LIBRARIES}" -DCMAKE_INSTALL_PREFIX=${PREFIX} cmake --build build -j${NPROC} diff --git a/pyproject.toml b/pyproject.toml index e10f0aadf..80fd491eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -104,8 +104,6 @@ before-all = [ [tool.cibuildwheel.linux] before-all = [ "yum install doxygen libxml2-devel libcurl-devel -y", - "wget https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip", - "unzip ninja-linux.zip -d /usr/local/bin", "buildscripts/build_dependencies.sh -p /usr/local" ] [tool.cibuildwheel.linux.environment]