Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-06-08 01:04:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow absolute path for compilationDatabaseDirectory

Browse Source
This commit is contained in:
sysRay 2019-03-21 10:26:21 +01:00
parent b7d9ced086
commit 560babbbfd
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/project.cc
View File

@ -46,6 +46,7 @@ limitations under the License.
#include <limits.h> #include <limits.h>
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
#include <filesystem>
using namespace clang; using namespace clang;
using namespace llvm; using namespace llvm;
@ -331,10 +332,12 @@ void Project::LoadDirectory(const std::string &root, Project::Folder &folder) {
std::string err_msg; std::string err_msg;
folder.entries.clear(); folder.entries.clear();
if (g_config->compilationDatabaseCommand.empty()) { if (g_config->compilationDatabaseCommand.empty()) {
CDBDir = root; if (g_config->compilationDatabaseDirectory.size()) {
if (g_config->compilationDatabaseDirectory.size()) if (std::filesystem::path(g_config->compilationDatabaseDirectory).is_relative())
sys::path::append(CDBDir, g_config->compilationDatabaseDirectory); sys::path::append(CDBDir, g_config->compilationDatabaseDirectory);
sys::path::append(Path, CDBDir, "compile_commands.json"); else
CDBDir = g_config->compilationDatabaseDirectory;
}
} else { } else {
// If `compilationDatabaseCommand` is specified, execute it to get the // If `compilationDatabaseCommand` is specified, execute it to get the
// compdb. // compdb.