diff --git a/build.ps1 b/build.ps1 index e13a4212..4ae6b2ef 100644 --- a/build.ps1 +++ b/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 diff --git a/packaging/make_installer.ps1 b/packaging/make_installer.ps1 index 2ceb97a0..6e364cfe 100644 --- a/packaging/make_installer.ps1 +++ b/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 diff --git a/src/config/config.cc b/src/config/config.cc index c0de719a..9a4f7bb5 100644 --- a/src/config/config.cc +++ b/src/config/config.cc @@ -255,12 +255,16 @@ std::vector diagram::get_translation_units() const for (const auto &g : glob()) { std::filesystem::path absolute_glob_path{g}; +#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(absolute_glob_path, true, false); + auto matches = glob::glob(absolute_glob_path.string(), true, false); for (const auto &match : matches) { const auto path =