From f85a968b9581a73709ec0fdc74db2075cc8fd466 Mon Sep 17 00:00:00 2001 From: Magnus Ulimoen Date: Mon, 29 Jul 2024 11:46:05 +0200 Subject: [PATCH] Upgrade to netcdf c v4.9.3-rc2 --- .gitmodules | 2 +- netcdf-src/build.rs | 40 ++++++++++++++++++---------------------- netcdf-src/source | 2 +- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3414937..cb3040b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "netcdf-src/source"] path = netcdf-src/source - url = https://github.com/magnusuMET/netcdf-c + url = https://github.com/Unidata/netcdf-c diff --git a/netcdf-src/build.rs b/netcdf-src/build.rs index 27d49a4..9e40d99 100644 --- a/netcdf-src/build.rs +++ b/netcdf-src/build.rs @@ -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/"); @@ -46,32 +46,28 @@ 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 @@ -79,8 +75,8 @@ fn main() { 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() { diff --git a/netcdf-src/source b/netcdf-src/source index 9a488e4..451cba5 160000 --- a/netcdf-src/source +++ b/netcdf-src/source @@ -1 +1 @@ -Subproject commit 9a488e46e84f9511714bc19f6435f94303808962 +Subproject commit 451cba565a2db71f4abad215bbf3adbbb88f3b52