matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed building main

Browse Source
This commit is contained in:
Bartek Kryza
2022-07-24 23:46:52 +02:00
parent 1cf271fedf
commit 3e4beef80b
10 changed files with 93 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.cc
View File

@@ -46,7 +46,7 @@ bool check_output_directory(const std::string &dir);
void generate_diagram(const std::string &od, const std::string &name,
std::shared_ptr<clanguml::config::diagram> diagram,
const cppast::libclang_compilation_database &db, bool verbose);
const clang::tooling::CompilationDatabase &db, bool verbose);
int main(int argc, const char *argv[])
{
@@ -104,7 +104,17 @@ int main(int argc, const char *argv[])
LOG_INFO("Loading compilation database from {} directory",
config.compilation_database_dir());
cppast::libclang_compilation_database db{config.compilation_database_dir()};
std::string err{};
auto db =
clang::tooling::CompilationDatabase::autoDetectFromDirectory(
config.compilation_database_dir(), err);
if (!err.empty()) {
LOG_ERROR("Failed to load compilation database from {}",
config.compilation_database_dir());
return 1;
}
auto od = config.output_directory();
if (output_directory)
@@ -124,7 +134,7 @@ int main(int argc, const char *argv[])
futs.emplace_back(generator_executor.add(
[&od, &name = name, &diagram = diagram, &db = db, verbose]() {
generate_diagram(od, name, diagram, db, verbose);
generate_diagram(od, name, diagram, *db, verbose);
}));
}
@@ -137,7 +147,7 @@ int main(int argc, const char *argv[])
void generate_diagram(const std::string &od, const std::string &name,
std::shared_ptr<clanguml::config::diagram> diagram,
const cppast::libclang_compilation_database &db, bool verbose)
const clang::tooling::CompilationDatabase &db, bool verbose)
{
using clanguml::common::model::diagram_t;
using clanguml::config::class_diagram;