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

Fixed building on MSVC (#287)

Browse Source
This commit is contained in:
Bartek Kryza
2024-06-10 20:09:13 +02:00
parent fa742a03c4
commit 4f9a09783f
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/make_installer.ps1
View File

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

4
src/include_diagram/visitor/translation_unit_visitor.cc
View File

@@ -83,8 +83,12 @@ void translation_unit_visitor::include_visitor::InclusionDirective(
assert(diagram().get(current_file_id.value()));
#if LLVM_VERSION_MAJOR > 14
if (!file.has_value())
return;
auto include_path = std::filesystem::path(file->getDir().getName().str());
#else
if (file == nullptr)
return;
auto include_path = std::filesystem::path(file->getDir()->getName().str());
#endif
include_path = include_path / file->getName().str();

6
tests/t00037/t00037.cc
View File

@@ -20,7 +20,11 @@ public:
struct {
int len;
int flags;
} __attribute__((packed)) bars[LENGTH];
}
#ifndef _MSC_VER
__attribute__((packed))
#endif
bars[LENGTH];
private:
struct {

29
tests/test_progress_indicator.cc
View File

@@ -26,6 +26,7 @@ TEST_CASE("Test progress indicator")
{
using namespace clanguml::common::generators;
using namespace std::string_literals;
using clanguml::util::contains;
std::stringstream sstr;
@@ -46,7 +47,19 @@ TEST_CASE("Test progress indicator")
output_lines.emplace_back(std::move(line));
REQUIRE_EQ(output_lines[0], "");
#ifdef _MSC_VER
REQUIRE(contains(output_lines[1],
"One [>----------------------------------] "
"[00:00s] 0/100"s));
REQUIRE(contains(output_lines[2],
"One [>----------------------------------] "
"[00m:00s] 1/100"s));
REQUIRE(contains(output_lines[3],
"One [===================================] "
"[00m:00s] 100/100 OK"s));
#else
REQUIRE_EQ(output_lines[1],
"One [█----------------------------------] "
"[00:00s] 0/100");
@@ -58,12 +71,14 @@ TEST_CASE("Test progress indicator")
REQUIRE_EQ(output_lines[3],
"One [███████████████████████████████████] "
"[00m:00s] 100/100 ✔");
#endif
}
TEST_CASE("Test progress indicator fail")
{
using namespace clanguml::common::generators;
using namespace std::string_literals;
using clanguml::util::contains;
std::stringstream sstr;
@@ -91,6 +106,19 @@ TEST_CASE("Test progress indicator fail")
REQUIRE_EQ(output_lines[0], "");
#ifdef _MSC_VER
REQUIRE(contains(output_lines[1],
"One [>----------------------------------] "
"[00:00s] 0/100"s));
REQUIRE(contains(output_lines[2],
"One [>----------------------------------] "
"[00m:00s] 1/100"s));
REQUIRE(contains(output_lines[3],
"One [>----------------------------------] "
"[00m:00s] 1/100 FAILED"s));
#else
REQUIRE_EQ(output_lines[1],
"One [█----------------------------------] "
"[00:00s] 0/100");
@@ -102,4 +130,5 @@ TEST_CASE("Test progress indicator fail")
REQUIRE_EQ(output_lines[3],
"One [█----------------------------------] "
"[00m:00s] 1/100 ✗");
#endif
}