From 5a13015ad932cffb092da080e8ea0ad2ce1f04a0 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Thu, 28 Jun 2018 18:20:15 +0200
Subject: Move compile_commands.json to project root directory, needed for IDEs

---
 backend/ninja/Ninja.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'backend/ninja/Ninja.cpp')

diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp
index 59e8486..227a179 100644
--- a/backend/ninja/Ninja.cpp
+++ b/backend/ninja/Ninja.cpp
@@ -917,7 +917,7 @@ namespace backend
             
             if(config.isMainProject())
             {
-                buildResult = buildCompilationDatabase(savePath);
+                buildResult = buildCompilationDatabase(savePath, config.getProjectPath());
                 if(!buildResult)
                     return buildResult;
             }
@@ -1011,7 +1011,7 @@ namespace backend
                 // Convenient to have project setup to tests as well
                 if(config.isMainProject())
                 {
-                    buildFileResult = buildCompilationDatabase(buildPath.c_str());
+                    buildFileResult = buildCompilationDatabase(buildPath.c_str(), testSourceDirNative);
                     if(!buildFileResult)
                         return buildFileResult;
                 }
@@ -1058,12 +1058,12 @@ namespace backend
             return Result<bool>::Err("");
     }
     
-    Result<bool> Ninja::buildCompilationDatabase(const _tinydir_char_t *buildFilePath)
+    Result<bool> Ninja::buildCompilationDatabase(const _tinydir_char_t *buildFilePath, const FileString &saveDir)
     {
         FileString command = TINYDIR_STRING("ninja -C \"");
         command += buildFilePath;
         command += TINYDIR_STRING("\" -t compdb c_COMPILER cpp_COMPILER BUILD_EXEC BUILD_STATIC BUILD_DYNAMIC > \"");
-        command += buildFilePath;
+        command += saveDir;
         command += TINYDIR_STRING("/compile_commands.json\"");
         Result<ExecResult> execResult = exec(command.c_str(), false);
         if(execResult.isOk())
-- 
cgit v1.2.3