check if libxml2 includes are in a libxml2 subdirectory

Author: zerocom38

build.rs

@@ -1,4 +1,7 @@
-use std::{env, fs, path::{Path, PathBuf}};
+use std::{
+  env, fs,
+  path::{Path, PathBuf},
+};
 
 struct ProbedLib {
   version: String,
@@ -40,20 +43,24 @@ fn find_libxml2() -> Option<ProbedLib> {
     );
     None
   } else {
-    #[cfg(any(target_family = "unix", target_os = "macos", all(target_family="windows", target_env="gnu")))]
+    #[cfg(any(
+      target_family = "unix",
+      target_os = "macos",
+      all(target_family = "windows", target_env = "gnu")
+    ))]
     {
       let lib = pkg_config::Config::new()
         .probe("libxml-2.0")
         .expect("Couldn't find libxml2 via pkg-config");
       return Some(ProbedLib {
         include_paths: lib.include_paths,
         version: lib.version,
-      })
+      });
     }
 
     #[cfg(all(target_family = "windows", target_env = "msvc"))]
     {
-      if let Some(meta) =  vcpkg_dep::vcpkg_find_libxml2() {
+      if let Some(meta) = vcpkg_dep::vcpkg_find_libxml2() {
         return Some(meta);
       } else {
         eprintln!("vcpkg did not succeed in finding libxml2.");
@@ -71,11 +78,12 @@ fn generate_bindings(header_dirs: Vec<PathBuf>, output_path: &Path) {
     // invalidate build as soon as the wrapper changes
     .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
     .layout_tests(true)
-    .clang_args(&["-DPKG-CONFIG", "-DLIBXML_C14N_ENABLED", "-DLIBXML_OUTPUT_ENABLED"])
-    .clang_args(
-      header_dirs.iter()
-        .map(|dir| format!("-I{}", dir.display()))
-    );
+    .clang_args(&[
+      "-DPKG-CONFIG",
+      "-DLIBXML_C14N_ENABLED",
+      "-DLIBXML_OUTPUT_ENABLED",
+    ])
+    .clang_args(header_dirs.iter().map(|dir| format!("-I{}", dir.display())));
   bindings
     .generate()
     .expect("failed to generate bindings with bindgen")
@@ -92,10 +100,13 @@ fn main() {
     // if we could find header files, generate fresh bindings from them
     generate_bindings(probed_lib.include_paths, &bindings_path);
     // and expose the libxml2 version to the code
-    let version_parts: Vec<i32> = probed_lib.version.split('.')
-      .map(|part| part.parse::<i32>().unwrap_or(-1)).collect();
-    let older_than_2_12 = version_parts.len() > 1 && (version_parts[0] < 2 ||
-        version_parts[0] == 2 && version_parts[1] < 12);
+    let version_parts: Vec<i32> = probed_lib
+      .version
+      .split('.')
+      .map(|part| part.parse::<i32>().unwrap_or(-1))
+      .collect();
+    let older_than_2_12 = version_parts.len() > 1
+      && (version_parts[0] < 2 || version_parts[0] == 2 && version_parts[1] < 12);
     println!("cargo::rustc-check-cfg=cfg(libxml_older_than_2_12)");
     if older_than_2_12 {
       println!("cargo::rustc-cfg=libxml_older_than_2_12");
@@ -113,12 +124,19 @@ fn main() {
 mod vcpkg_dep {
   use crate::ProbedLib;
   pub fn vcpkg_find_libxml2() -> Option<ProbedLib> {
-    if let Ok(metadata) = vcpkg::Config::new()
-      .find_package("libxml2") {
-      Some(ProbedLib { version: vcpkg_version(), include_paths: metadata.include_paths })
-    } else {
-      None
+    if let Ok(mut metadata) = vcpkg::Config::new().find_package("libxml2") {
+      if let Some(mut include_path) = metadata.include_paths.pop() {
+        if include_path.join("libxml2").exists() {
+          // libxml2 >= 2.14.5 is in a 'libxml2' subdirectory
+          include_path = include_path.join("libxml2");
+        }
+        return Some(ProbedLib {
+          version: vcpkg_version(),
+          include_paths: vec![include_path],
+        });
+      }
     }
+    None
   }
 
   fn vcpkg_version() -> String {
@@ -127,7 +145,7 @@ mod vcpkg_dep {
     let mut vcpkg_exe = vcpkg::find_vcpkg_root(&vcpkg::Config::new()).unwrap();
     vcpkg_exe.push("vcpkg.exe");
     let vcpkg_list_libxml2 = std::process::Command::new(vcpkg_exe)
-      .args(["list","libxml2"])
+      .args(["list", "libxml2"])
       .output()
       .expect("vcpkg.exe failed to execute in vcpkg_dep build step");
     if vcpkg_list_libxml2.status.success() {
@@ -137,9 +155,8 @@ mod vcpkg_dep {
           let mut version_piece = line.split("2.");
           version_piece.next();
           if let Some(version_tail) = version_piece.next() {
-            if let Some(version) = version_tail.split(' ').next()
-              .unwrap().split('#').next() {
-                return format!("2.{version}");
+            if let Some(version) = version_tail.split(' ').next().unwrap().split('#').next() {
+              return format!("2.{version}");
             }
           }
         }