Compare commits

...

3 Commits

Author SHA1 Message Date
Bartek Kryza
7d28be525f Fixed glob absolute paths handling on Windows 2024-01-28 15:55:59 +01:00
Bartek Kryza
3dba31a792 Fixed handling of absolute paths in glob patterns 2024-01-28 13:12:07 +01:00
Bartek Kryza
334140b73c Merge pull request #232 from bkryza/refactor-sequence-tuvisitor-template-building
Refactor sequence tuvisitor template building
2024-01-25 11:11:52 +01:00
4 changed files with 13 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
param ($Prefix="C:\clang-uml", $BuildType="Release") param ($Prefix="C:\clang-uml-llvm17", $BuildType="Release")
cmake -S . -B $BuildType -DCMAKE_PREFIX_PATH="$Prefix" -DENABLE_CXX_MODULES_TEST_CASES=OFF -Thost=x64 cmake -S . -B $BuildType -DCMAKE_PREFIX_PATH="$Prefix" -DENABLE_CXX_MODULES_TEST_CASES=OFF -Thost=x64
cmake --build $BuildType --config $BuildType cmake --build $BuildType --config $BuildType

View File

@@ -1,6 +1,6 @@
# This script assumes that all clang-uml dependencies are instaled in C:\clang-uml # This script assumes that all clang-uml dependencies are instaled in C:\clang-uml
param ($Prefix="C:\clang-uml", $BuildType="Release") param ($Prefix="C:\clang-uml-llvm17", $BuildType="Release")
mkdir _BUILD mkdir _BUILD

View File

@@ -253,12 +253,18 @@ std::vector<std::string> diagram::get_translation_units() const
LOG_DBG("Looking for translation units in {}", root_directory().string()); LOG_DBG("Looking for translation units in {}", root_directory().string());
for (const auto &g : glob()) { for (const auto &g : glob()) {
std::string glob_path = std::filesystem::path absolute_glob_path{g};
fmt::format("{}/{}", root_directory().string(), g.c_str());
LOG_DBG("Searching glob path {}", glob_path); #ifdef _MSC_VER
if (!absolute_glob_path.has_root_name())
#else
if (!absolute_glob_path.is_absolute())
#endif
absolute_glob_path = root_directory() / absolute_glob_path;
auto matches = glob::glob(glob_path, true, false); LOG_DBG("Searching glob path {}", absolute_glob_path.string());
auto matches = glob::glob(absolute_glob_path.string(), true, false);
for (const auto &match : matches) { for (const auto &match : matches) {
const auto path = const auto path =

View File

@@ -2,7 +2,7 @@ diagrams:
t00025_class: t00025_class:
type: class type: class
glob: glob:
- /t00025.cc - t00025.cc
using_namespace: clanguml::t00025 using_namespace: clanguml::t00025
include: include:
namespaces: namespaces: