Fix c++ module files

rerun-io · Dec 11, 2023 · d8d2c66 · d8d2c66
1 parent 6db63a1
commit d8d2c66
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 11 deletions.
diff --git a/crates/re_types_builder/src/codegen/cpp/mod.rs b/crates/re_types_builder/src/codegen/cpp/mod.rs
@@ -213,7 +213,11 @@ impl CppCodeGenerator {
             let header_file_names = ordered_objects
                 .iter()
                 .filter(|obj| obj.is_testing() == testing)
-                .map(|obj| format!("{folder_name}/{}.hpp", obj.snake_case_name()));
+                .map(|obj| format!("{folder_name}/{}.hpp", obj.snake_case_name()))
+                .collect_vec();
+            if header_file_names.is_empty() {
+                continue;
+            }
             let tokens = quote! {
                 #pragma_once
                 #(#hash include #header_file_names "NEWLINE_TOKEN")*
@@ -223,10 +227,10 @@ impl CppCodeGenerator {
             } else {
                 &folder_path_sdk
             };
-            let filepath = folder_path
-                .parent()
-                .unwrap()
-                .join(format!("{folder_name}.hpp"));
+            let filepath = folder_path.parent().unwrap().join(format!(
+                "{}.hpp",
+                object_kind.plural_snake_case().to_owned()
+            ));
             let contents = string_from_token_stream(&tokens, None);
             files_to_write.insert(filepath, contents);
         }

diff --git a/rerun_cpp/src/rerun/blueprint/.gitattributes b/rerun_cpp/src/rerun/blueprint/.gitattributes
diff --git a/...erated/blueprint/blueprint/.gitattributes → .../rerun/blueprint/blueprint/.gitattributes b/...erated/blueprint/blueprint/.gitattributes → .../rerun/blueprint/blueprint/.gitattributes
diff --git a/...erated/blueprint/blueprint/archetypes.hpp → .../rerun/blueprint/blueprint/archetypes.hpp b/...erated/blueprint/blueprint/archetypes.hpp → .../rerun/blueprint/blueprint/archetypes.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/blueprint/components.hpp b/rerun_cpp/src/rerun/blueprint/blueprint/components.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/blueprint/datatypes.hpp b/rerun_cpp/src/rerun/blueprint/blueprint/datatypes.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/components.hpp b/rerun_cpp/src/rerun/blueprint/components.hpp
diff --git a/rerun_cpp/src/rerun/blueprint/datatypes.hpp b/rerun_cpp/src/rerun/blueprint/datatypes.hpp
diff --git a/rerun_cpp/tests/generated/blueprint/blueprint/components.hpp b/rerun_cpp/tests/generated/blueprint/blueprint/components.hpp
diff --git a/rerun_cpp/tests/generated/blueprint/blueprint/datatypes.hpp b/rerun_cpp/tests/generated/blueprint/blueprint/datatypes.hpp