Merge pull request #233 from bkryza/fix-glob-absolute-paths

Fixed handling of absolute paths in glob patterns

Author: bkryza

build.ps1

@@ -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 --build $BuildType --config $BuildType

packaging/make_installer.ps1

@@ -1,6 +1,6 @@
 # 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
 

src/config/config.cc

@@ -253,12 +253,18 @@ std::vector<std::string> diagram::get_translation_units() const
     LOG_DBG("Looking for translation units in {}", root_directory().string());
 
     for (const auto &g : glob()) {
-        std::string glob_path =
-            fmt::format("{}/{}", root_directory().string(), g.c_str());
+        std::filesystem::path absolute_glob_path{g};
 
-        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;
+
+        LOG_DBG("Searching glob path {}", absolute_glob_path.string());
 
-        auto matches = glob::glob(glob_path, true, false);
+        auto matches = glob::glob(absolute_glob_path.string(), true, false);
 
         for (const auto &match : matches) {
             const auto path =

tests/t00025/.clang-uml

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