ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Fixes in project setup

Browse Source 
* fixed include paths fetched from CDB not canonical
* fixed content names
This commit is contained in:
Eberhard Graether
2017-10-25 00:57:28 +02:00
parent c4de8f1af8
commit c73e58893e
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_cxx/utility/CompilationDatabase.cpp
+4 -5
View File
@@ -17,7 +17,6 @@ utility::CompilationDatabase::CompilationDatabase(const FilePath& filePath)
std::vector<FilePath> utility::CompilationDatabase::getAllHeaderPaths() const
{
std::vector<FilePath> paths = utility::concat(m_headers, m_systemHeaders);
paths = utility::concat(paths, m_frameworkHeaders);
paths = utility::unique(paths);
return paths;
}
@@ -66,19 +65,19 @@ void utility::CompilationDatabase::init()
if (utility::isPrefix(frameworkIncludeFlag, argument))
{
frameworkHeaders.insert(FilePath(utility::trim(argument.substr(frameworkIncludeFlag.size())), command.Directory));
frameworkHeaders.insert(FilePath(utility::trim(argument.substr(frameworkIncludeFlag.size())), command.Directory).canonical());
}
else if (utility::isPrefix(systemIncludeFlag, argument))
{
systemHeaders.insert(FilePath(utility::trim(argument.substr(systemIncludeFlag.size())), command.Directory));
systemHeaders.insert(FilePath(utility::trim(argument.substr(systemIncludeFlag.size())), command.Directory).canonical());
}
else if (utility::isPrefix(quoteFlag, argument))
{
headers.insert(FilePath(utility::trim(argument.substr(quoteFlag.size())), command.Directory));
headers.insert(FilePath(utility::trim(argument.substr(quoteFlag.size())), command.Directory).canonical());
}
else if (utility::isPrefix(includeFlag, argument))
{
headers.insert(FilePath(utility::trim(argument.substr(includeFlag.size())), command.Directory));
headers.insert(FilePath(utility::trim(argument.substr(includeFlag.size())), command.Directory).canonical());
}
}
}