Skip to content

Commit

Permalink
Upgrade to netcdf c v4.9.3-rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
magnusuMET committed Jul 29, 2024
1 parent 52d4361 commit 8ef9a9e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "netcdf-src/source"]
path = netcdf-src/source
url = https://github.com/mulimoen/netcdf-c
url = https://github.com/Unidata/netcdf-c
40 changes: 18 additions & 22 deletions netcdf-src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ fn main() {
let mut hdf5_lib = std::env::var("DEP_HDF5_LIBRARY").unwrap();
let mut hdf5_hl_lib = std::env::var("DEP_HDF5_HL_LIBRARY").unwrap();

let hdf5_root = format!("{hdf5_incdir}/../");
#[cfg(unix)]
{
let hdf5_root = format!("{hdf5_incdir}/../");
let mut hdf5_libdir = format!("{hdf5_root}/lib/");
if !std::path::Path::new(&hdf5_libdir).exists() {
hdf5_libdir = format!("{hdf5_root}/lib64/");
Expand All @@ -46,41 +46,37 @@ fn main() {
let mut netcdf_config = cmake::Config::new("source");
netcdf_config
.define("BUILD_SHARED_LIBS", "OFF")
.define("NC_FIND_SHARED_LIBS", "OFF")
.define("BUILD_UTILITIES", "OFF")
.define("ENABLE_EXAMPLES", "OFF")
.define("ENABLE_DAP_REMOTE_TESTS", "OFF")
.define("ENABLE_TESTS", "OFF")
.define("ENABLE_EXTREME_NUMBERS", "OFF")
.define("ENABLE_PARALLEL_TESTS", "OFF")
.define("ENABLE_FILTER_TESTING", "OFF")
.define("NETCDF_FIND_SHARED_LIBS", "OFF")
.define("NETCDF_BUILD_UTILITIES", "OFF")
.define("NETCDF_ENABLE_EXAMPLES", "OFF")
.define("NETCDF_ENABLE_DAP_REMOTE_TESTS", "OFF")
.define("NETCDF_ENABLE_TESTS", "OFF")
.define("NETCDF_ENABLE_EXTREME_NUMBERS", "OFF")
.define("NETCDF_ENABLE_PARALLEL_TESTS", "OFF")
.define("NETCDF_ENABLE_FILTER_TESTING", "OFF")
.define("ENABLE_BASH_SCRIPT_TESTING", "OFF")
.define("ENABLE_PLUGINS", "OFF")
.define("NETCDF_NETCDF_ENABLE_PLUGINS", "OFF")
.define("PLUGIN_INSTALL_DIR", "OFF")
//
.define("HDF5_VERSION", &hdf5_version)
.define("HDF5_C_LIBRARY", &hdf5_lib)
.define("HDF5_HL_LIBRARY", &hdf5_hl_lib)
.define("HDF5_INCLUDE_DIR", hdf5_incdir)
.define("HDF5_ROOT", &hdf5_root)
//
.define("ENABLE_LIBXML2", "OFF") // Use bundled xml2
.define("NETCDF_ENABLE_LIBXML2", "OFF") // Use bundled xml2
//
.define("ENABLE_PARALLEL4", "OFF") // TODO: Enable mpi support
.define("NETCDF_ENABLE_PARALLEL4", "OFF") // TODO: Enable mpi support
//
.define("ENABLE_NCZARR", "OFF") // TODO: requires a bunch of deps
.define("NETCDF_ENABLE_NCZARR", "OFF") // TODO: requires a bunch of deps
//
.define("ENABLE_DAP", "OFF") // TODO: feature flag, requires curl
.define("ENABLE_BYTERANGE", "OFF") // TODO: feature flag, requires curl
.define("ENABLE_DAP_REMOTE_TESTS", "OFF")
.define("NETCDF_ENABLE_DAP", "OFF") // TODO: feature flag, requires curl
.define("NETCDF_ENABLE_BYTERANGE", "OFF") // TODO: feature flag, requires curl
//
.profile("RelWithDebInfo"); // TODO: detect opt-level

let zlib_include_dir = std::env::var("DEP_Z_INCLUDE").unwrap();
netcdf_config.define("ZLIB_ROOT", format!("{zlib_include_dir}/.."));

if feature!("DAP").is_ok() {
netcdf_config.define("ENABLE_DAP", "ON");
netcdf_config.define("ENABLE_BYTERANGE", "ON");
netcdf_config.define("NETCDF_ENABLE_DAP", "ON");
netcdf_config.define("NETCDF_ENABLE_BYTERANGE", "ON");
}

if feature!("MPI").is_ok() {
Expand Down
2 changes: 1 addition & 1 deletion netcdf-src/source
Submodule source updated 1263 files

0 comments on commit 8ef9a9e

Please sign in to comment.