From 1776e5dd9c28dff3ec660a4d76d9b9ab5e37a761 Mon Sep 17 00:00:00 2001
From: Julio Gonzalez <107922352+hoolioh@users.noreply.github.com>
Date: Tue, 3 Dec 2024 12:05:43 +0100
Subject: [PATCH] Fix builder cmake target directory. (#776)

* Fix cmake target directory.
---
 builder/src/builder.rs      | 7 ++++++-
 builder/src/crashtracker.rs | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/builder/src/builder.rs b/builder/src/builder.rs
index 92672adc6..08850dc78 100644
--- a/builder/src/builder.rs
+++ b/builder/src/builder.rs
@@ -139,7 +139,12 @@ impl Builder {
 
     pub fn add_cmake(&self) {
         let libs = arch::NATIVE_LIBS.to_owned();
-        let cmake_path: PathBuf = [&self.target_dir, "DatadogConfig.cmake"].iter().collect();
+        let cmake_dir: PathBuf = [&self.target_dir, "cmake"].iter().collect();
+        fs::create_dir_all(cmake_dir).expect("Failed to create cmake dir");
+
+        let cmake_path: PathBuf = [&self.target_dir, "cmake", "DatadogConfig.cmake"]
+            .iter()
+            .collect();
         let mut origin = project_root();
         origin.push("cmake");
         origin.push("DatadogConfig.cmake.in");
diff --git a/builder/src/crashtracker.rs b/builder/src/crashtracker.rs
index be2c7603b..489e9c173 100644
--- a/builder/src/crashtracker.rs
+++ b/builder/src/crashtracker.rs
@@ -22,11 +22,14 @@ pub struct CrashTracker {
 impl CrashTracker {
     fn gen_binaries(&self) -> Result<()> {
         if arch::BUILD_CRASHTRACKER {
+            let mut datadog_root = project_root();
+            datadog_root.push(self.target_dir.as_ref());
+
             let mut crashtracker_dir = project_root();
             crashtracker_dir.push("crashtracker");
             let _dst = cmake::Config::new(crashtracker_dir.to_str().unwrap())
-                .define("Datadog_ROOT", self.target_dir.as_ref())
-                .define("CMAKE_INSTALL_PREFIX", self.target_dir.as_ref())
+                .define("Datadog_ROOT", datadog_root.to_str().unwrap())
+                .define("CMAKE_INSTALL_PREFIX", self.target_dir.to_string())
                 .build();
         }