Merge branch 'release-0.4.5'

tudelft3d · Feb 12, 2024 · d9167b3 · d9167b3
2 parents 02eec43 + 8a85c09
commit d9167b3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git 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

diff --git 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
@@ -31,7 +31,7 @@
 
 #include  <boost/algorithm/string/predicate.hpp>
 
-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
@@ -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 <boost/next_prior.hpp>
+
 #include <CGAL/Intersection_traits_3.h>
 #include <CGAL/Intersections_3/internal/Line_3_Plane_3_intersection.h>