refactor project::get_library_name (#13)

rjodinchr · Dec 2, 2024 · 5c10b7e · 5c10b7e
1 parent cbc31e8
commit 5c10b7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/ninja_target.rs b/src/ninja_target.rs
@@ -123,7 +123,7 @@ impl NinjaTarget {
                         .replace(".so", "")
                 } else {
                     generated_libraries.insert(lib.to_string());
-                    project.get_library_name(lib)
+                    rework_name(project.get_library_name(lib))
                 };
                 if lib.ends_with(".a") {
                     static_libraries.insert(lib_name);

diff --git a/src/project/clvk.rs b/src/project/clvk.rs
@@ -106,12 +106,10 @@ impl<'a> crate::project::Project<'a> for Clvk<'a> {
         let mut deps: GenDepsMap = HashMap::new();
         let mut libs: HashSet<String> = HashSet::new();
         for library in &self.generated_libraries {
-            let prefix = if project == ProjectId::LlvmProject {
-                "external/clspv/third_party/llvm/".to_string()
-            } else {
-                "external/".to_string() + &add_slash_suffix(project.str())
-            };
-            if let Some(lib) = library.strip_prefix(&prefix) {
+            if let Some(lib) = self
+                .get_library_name(library)
+                .strip_prefix(&add_slash_suffix(project.str()))
+            {
                 libs.insert(lib.to_string());
             }
         }
@@ -121,10 +119,11 @@ impl<'a> crate::project::Project<'a> for Clvk<'a> {
 
     fn get_library_name(&self, library: &str) -> String {
         library
-            .replace("external/clspv/third_party/llvm", "llvm-project")
+            .replace(
+                "external/clspv/third_party/llvm",
+                ProjectId::LlvmProject.str(),
+            )
             .replace("external/", "")
-            .replace("/", "_")
-            .replace(".", "_")
     }
 
     fn get_target_header_libs(&self, _target: &str) -> HashSet<String> {