cxx-qt-build: split include and exported include dirs

Author: ahayzen-kdab

crates/cxx-qt-build/src/dir.rs

@@ -121,6 +121,10 @@ pub(crate) fn header_root() -> PathBuf {
     crate_target().join("include")
 }
 
+pub(crate) fn header_root_interface() -> PathBuf {
+    target().join("crates-include")
+}
+
 /// The OUT_DIR, converted into a PathBuf
 pub(crate) fn out() -> PathBuf {
     env::var("OUT_DIR").unwrap().into()

crates/cxx-qt-build/src/interface.rs

@@ -133,16 +133,36 @@ impl Interface {
     }
 
     fn write_exported_include_directories(&self) {
-        let header_root = dir::header_root();
+        // Add any export directories as a child of the include interface directory
+        let header_root_interface = dir::header_root_interface();
+        std::fs::create_dir_all(&header_root_interface)
+            .expect("Failed to create header root for interface");
         for (header_dir, dest) in &self.exported_include_directories {
-            let dest_dir = header_root.join(dest);
-            if let Err(e) = dir::symlink_or_copy_directory(header_dir, dest_dir) {
-                panic!(
+            let dest_dir = header_root_interface.join(dest);
+            match dir::symlink_or_copy_directory(header_dir, &dest_dir) {
+                Ok(true) => {},
+                Ok(false) => panic!("Failed to create symlink folder for `{dest}`"),
+                Err(e) => panic!(
                         "Failed to {INCLUDE_VERB} `{dest}` for export_include_directory `{dir_name}`: {e:?}",
                         dir_name = header_dir.to_string_lossy()
                     )
             };
         }
+
+        // Add any reexport links as a child of the include interface directory
+        let header_root = dir::header_root();
+        for reexport in &self.reexport_links {
+            let source_dir = header_root.join(reexport);
+            let dest_dir = header_root_interface.join(reexport);
+            match dir::symlink_or_copy_directory(&source_dir, &dest_dir) {
+                Ok(true) => {},
+                Ok(false) => panic!("Failed to create symlink folder for `{reexport}`"),
+                Err(e) => panic!(
+                        "Failed to {INCLUDE_VERB} `{reexport}` for export_include_directory `{dir_name}`: {e:?}",
+                        dir_name = source_dir.to_string_lossy()
+                    )
+            };
+        }
     }
 }
 

crates/cxx-qt-build/src/lib.rs

@@ -653,12 +653,17 @@ impl CxxQtBuilder {
     // or deep copy the files if the platform does not support symlinks.
     fn include_dependency(&mut self, dependency: &Dependency) {
         let header_root = dir::header_root();
-        let dependency_root = dependency.path.join("include");
+        let dependency_root = dependency.path.join("crates-include");
         for include_prefix in &dependency.manifest.exported_include_prefixes {
             // setup include directory
             let source = dependency_root.join(include_prefix);
             let dest = header_root.join(include_prefix);
 
+            // Not all crates have include interface, skip it this does not exist
+            if !Path::new(&source).is_dir() {
+                continue;
+            }
+
             match dir::symlink_or_copy_directory(source, dest) {
                 Ok(true) => (),
                 Ok(false) => {