Merge branch 'release-0.6.1' into main

.github/workflows/build.yml

@@ -16,15 +16,15 @@ jobs:
         run: |
             sudo apt-get update
             sudo apt-get install libgmp-dev libmpfr-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
-      - name: Download CGAL 6.0
+      - name: Download CGAL 6.0.1
         run: |
-            wget https://github.com/CGAL/cgal/releases/download/v6.0/CGAL-6.0-library.tar.xz -P ${{ github.workspace }}
+            wget https://github.com/CGAL/cgal/releases/download/v6.0.1/CGAL-6.0.1-library.tar.xz -P ${{ github.workspace }}
             cd ${{ github.workspace }}
-            tar -xvf CGAL-6.0-library.tar.xz
+            tar -xvf CGAL-6.0.1-library.tar.xz
       - name: Build
         run: |
             mkdir build && cd build
-            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-6.0 && make -j4
+            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-6.0.1 && make -j4
 
   build_linux_2204:
     runs-on: ubuntu-22.04
@@ -34,15 +34,15 @@ jobs:
         run: |
             sudo apt-get update
             sudo apt-get install libgmp-dev libmpfr-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
-      - name: Download CGAL 6.0
+      - name: Download CGAL 6.0.1
         run: |
-            wget https://github.com/CGAL/cgal/releases/download/v6.0/CGAL-6.0-library.tar.xz -P ${{ github.workspace }}
+            wget https://github.com/CGAL/cgal/releases/download/v6.0.1/CGAL-6.0.1-library.tar.xz -P ${{ github.workspace }}
             cd ${{ github.workspace }}
-            tar -xvf CGAL-6.0-library.tar.xz
+            tar -xvf CGAL-6.0.1-library.tar.xz
       - name: Build
         run: |
             mkdir build && cd build
-            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-6.0 && make -j4
+            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-6.0.1 && make -j4
 
   build_macos:
     runs-on: macos-latest

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## [0.6.1] - 2025-02-06
+### Fixed
+- Docker image hotfix
+- CGAL version update in CMakeLists
 
 ## [0.6.0] - 2025-01-03
 ### Changed

CMakeLists.txt

@@ -34,11 +34,11 @@ endif (WIN32)
 
 # CGAL
 find_package(CGAL REQUIRED)
-if (CGAL_VERSION VERSION_GREATER_EQUAL "5.5")
+if (CGAL_VERSION VERSION_GREATER_EQUAL "6.0.1")
    message(STATUS "Found CGAL version ${CGAL_VERSION}")
 else()
    message(FATAL_ERROR "Found CGAL version ${CGAL_VERSION} which is not supported!"
-           "Please use CGAL version 5.5 or higher")
+           " Please use CGAL version 6.0.1 or higher")
    return()
 endif ()
 

README.md

@@ -52,7 +52,7 @@ GMP, MFPR, and Eigen are necessary dependencies for CGAL.
 
 Dependencies are generally available in Linux distributions, e.g. in Debian/Ubuntu/Mint:
 ```
-sudo apt-get install libcmpfr-dev libgmp-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
+sudo apt-get install libmpfr-dev libgmp-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
 ```
 
 CGAL can be directly downloaded from the [release page](https://github.com/CGAL/cgal/releases/tag/v5.6.1) (-library). No install is necessary, only the path to the unzipped folder is required (see below).

docker/city4cfd-build-base.dockerfile

@@ -24,9 +24,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /tmp/*
 
 # Download and extract CGAL
-RUN wget https://github.com/CGAL/cgal/releases/download/v6.0/CGAL-6.0-library.tar.xz \
-    && tar -xf CGAL-6.0-library.tar.xz -C /opt \
-    && rm CGAL-6.0-library.tar.xz
+RUN wget https://github.com/CGAL/cgal/releases/download/v6.0.1/CGAL-6.0.1-library.tar.xz \
+    && tar -xf CGAL-6.0.1-library.tar.xz -C /opt \
+    && rm CGAL-6.0.1-library.tar.xz
 
 # Set environment variable for CGAL
-ENV CGAL_DIR=/opt/CGAL-6.0
+ENV CGAL_DIR=/opt/CGAL-6.0.1

src/main.cpp

@@ -29,7 +29,7 @@
 
 #include  <boost/algorithm/string/predicate.hpp>
 
-std::string CITY4CFD_VERSION = "0.6.0";
+std::string CITY4CFD_VERSION = "0.6.1";
 
 void printWelcome() {
     auto logo{