From 5a39f2fe91279139b3280b1ccd5152d025ec274a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Pa=C4=91en?= <49401914+ipadjen@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:47:58 +0100 Subject: [PATCH 1/2] Boost/CGAL dependency hotfix --- CHANGELOG.md | 4 ++++ src/main.cpp | 2 +- .../internal/Plane_3_Triangle_3_intersection.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5955fc7e..9b484aa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [0.4.5] - 2024-02-12 +### Fixed +- Dependency hotfix + ## [0.4.4] - 2024-01-13 ### Changed - Improved fallbacks in case building import fails in late stages diff --git a/src/main.cpp b/src/main.cpp index 3b5ac231..34de1c11 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,7 +31,7 @@ #include -std::string CITY4CFD_VERSION = "0.4.4"; +std::string CITY4CFD_VERSION = "0.4.5"; void printWelcome() { auto logo{ diff --git a/thirdparty/CGAL/include/CGAL/Intersections_3/internal/Plane_3_Triangle_3_intersection.h b/thirdparty/CGAL/include/CGAL/Intersections_3/internal/Plane_3_Triangle_3_intersection.h index fae5317c..59072896 100644 --- a/thirdparty/CGAL/include/CGAL/Intersections_3/internal/Plane_3_Triangle_3_intersection.h +++ b/thirdparty/CGAL/include/CGAL/Intersections_3/internal/Plane_3_Triangle_3_intersection.h @@ -13,6 +13,8 @@ #ifndef CGAL_INTERNAL_INTERSECTIONS_PLANE_3_TRIANGLE_3_INTERSECTION_H #define CGAL_INTERNAL_INTERSECTIONS_PLANE_3_TRIANGLE_3_INTERSECTION_H +#include + #include #include From 8a85c09c8aea0af043a5168604ac21c495b102da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Pa=C4=91en?= <49401914+ipadjen@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:54:58 +0100 Subject: [PATCH 2/2] Don't check win64 for now --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c82d6606..03b1e360 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,6 +50,7 @@ jobs: build_win64: runs-on: windows-latest + if: false steps: - uses: actions/checkout@v3 - name: vcpkg build