add DAP support, and use patch section in toml

Author: magnusuMET

netcdf-sys/Cargo.toml

@@ -8,15 +8,16 @@ authors = [
 license = "MIT"
 description = "FFI bindings to NetCDF"
 repository = "https://github.com/georust/netcdf"
-documentation = "https://github.com/georust/netcdf"
+documentation = "https://docs.rs/netcdf"
 keywords = ["netcdf", "hdf", "hdf5", "cdm", "ffi"]
 edition = "2018"
 links = "netcdf"
 build = "build.rs"
 
 [dependencies]
-hdf5-sys = { git = "https://github.com/magnusuMET/hdf5-rust.git", branch = "feature/static_build", features = ["hl", "threadsafe", "deprecated"] }
 libz-sys = { version = "1.0.25", optional = true }
+curl-sys = { version = "0.4.25", optional = true }
+hdf5-sys = { version = "0.5.3", features = ["hl", "threadsafe", "deprecated"] }
 
 [dev-dependencies]
 lazy_static = "1.4.0"
@@ -28,4 +29,10 @@ cmake = "0.1.42"
 default = ["libz"]
 memio = []
 static = ["libz-sys/static", "hdf5-sys/static"]
+# TODO: Link static curl (but only when using "dap") "curl-sys/static-curl", "curl-sys/static-ssl"
 libz = ["libz-sys"]
+dap = ["curl-sys"]
+
+[patch]
+[patch.crates-io]
+hdf5-sys = { git = "https://github.com/magnusuMET/hdf5-rust.git", branch = "feature/static_build" }

netcdf-sys/build.rs

@@ -21,7 +21,8 @@ fn build() {
     let hdf5_hl_lib = std::env::var("DEP_HDF5_HL_LIBRARY").unwrap();
 
 
-    let netcdf = cmake::Config::new("source")
+    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")
@@ -39,9 +40,13 @@ fn build() {
         //
         .define("ENABLE_DAP", "OFF") // TODO: feature flag, requires curl
         //
-        .profile("RelWithDebInfo") // TODO: detect opt-level
-        .very_verbose(true)
-        .build();
+        .profile("RelWithDebInfo"); // TODO: detect opt-level
+
+    if feature!("DAP").is_ok() {
+        netcdf_config.define("ENABLE_DAP", "ON");
+    }
+
+    let netcdf = netcdf_config.build();
 
     println!("cargo:rustc-link-lib=static=netcdf");
     println!("cargo:rustc-link-search=native={}/lib", netcdf.display());

netcdf-sys/source

@@ -3,6 +3,9 @@
 
 extern crate hdf5_sys;
 
+#[cfg(feature = "dap")]
+extern crate curl_sys;
+
 mod netcdf_bindings;
 mod netcdf_const;
 pub use netcdf_bindings::*;