Merge branch 'SFCGALv2' into 'master'

SFCGAL v2

See merge request sfcgal/SFCGAL!329

.cirrus.yml

@@ -10,9 +10,10 @@ task:
     - pkg install -y cgal gmp mpfr boost-libs cmake ninja
 
   build_script:
-    - fetch "https://github.com/CGAL/cgal/releases/download/v5.6/CGAL-5.6.tar.xz" -o CGAL-5.6.tar.xz
-    - tar xJf CGAL-5.6.tar.xz
-    - cmake -GNinja -S . -B build -DSFCGAL_BUILD_TESTS=ON -DCGAL_DIR=CGAL-5.6
+    - export CGAL_VERSION=6.0-beta1
+    - fetch "https://github.com/CGAL/cgal/releases/download/v${CGAL_VERSION}/CGAL-${CGAL_VERSION}.tar.xz" -o CGAL-${CGAL_VERSION}.tar.xz
+    - tar xJf CGAL-${CGAL_VERSION}.tar.xz
+    - cmake -GNinja -S . -B build -DSFCGAL_BUILD_TESTS=ON -DCGAL_DIR=CGAL-${CGAL_VERSION}
     - cmake --build build
     - ctest -VV --test-dir build
   freebsd_instance:
@@ -22,12 +23,12 @@ task:
     - name: 15.0-CURRENT
       freebsd_instance:
         image_family: freebsd-15-0-snap
-    - name: 14.0-RELEASE
+    - name: 14.1-RELEASE
       freebsd_instance:
-        image_family: freebsd-14-0
-    - name: 13.2-RELEASE
+        image_family: freebsd-14-1
+    - name: 13.3-RELEASE
       freebsd_instance:
-        image_family: freebsd-13-2
+        image_family: freebsd-13-3
 
 task:
   name: macOS

.github/workflows/codeql.yml

@@ -53,7 +53,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-          sudo ./ci/debian/before_install.sh 5.6
+          sudo ./ci/debian/before_install.sh 6.0-beta1
 
     - name: Build
       run: |

.gitlab/pipeline/debian.yml

@@ -12,11 +12,11 @@ debian_testing_gcc:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6"]
+      - CGAL_VERSION: ["6.0-beta1"]
 
-debian_bullseye_gcc:
+debian_stable_gcc:
   stage: test
-  image: debian:bullseye
+  image: debian:stable
 
   script:
     - apt-get update -qq
@@ -28,7 +28,7 @@ debian_bullseye_gcc:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6"]
+      - CGAL_VERSION: ["6.0-beta1"]
 
 debian_testing_clang:
   stage: test
@@ -44,11 +44,11 @@ debian_testing_clang:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6"]
+      - CGAL_VERSION: ["6.0-beta1"]
 
-debian_bullseye_clang:
+debian_stable_clang:
   stage: test
-  image: debian:bullseye
+  image: debian:stable
 
   script:
     - apt-get update -qq
@@ -60,4 +60,4 @@ debian_bullseye_clang:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6"]
+      - CGAL_VERSION: ["6.0-beta1"]

.gitlab/pipeline/fedora.yml

@@ -1,6 +1,6 @@
-fedora38_clang:
+fedora40_clang:
   stage: test
-  image: fedora:38
+  image: fedora:40
 
   script:
     - yum update -qy
@@ -12,11 +12,11 @@ fedora38_clang:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6"]
+      - CGAL_VERSION: ["6.0-beta1"]
 
-fedora38_gcc:
+fedora40_gcc:
   stage: test
-  image: fedora:38
+  image: fedora:40
 
   script:
     - yum update -qy
@@ -28,4 +28,4 @@ fedora38_gcc:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6"]
+      - CGAL_VERSION: ["6.0-beta1"]

.gitlab/pipeline/sonar.yml

@@ -1,5 +1,5 @@
 # SonarCloud
-image: gcc
+image: debian:stable
 
 variables:
   SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
@@ -15,6 +15,8 @@ get-sonar-binaries:
       - build-wrapper/
       - sonar-scanner/
   script:
+    - apt-get update -qq
+    - apt-get install --yes sudo curl wget build-essential unzip
     # Download sonar-scanner
     - curl -sSLo ./sonar-scanner.zip "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip"
     - unzip -o sonar-scanner.zip
@@ -38,11 +40,12 @@ build:
       - bw-output/
       - build/ # the build has to be made available to the sonar-scanner for the analysis
   before_script:
-    - ./ci/debian/before_install.sh 5.6
+    - apt-get update -qq
+    - apt-get install --yes sudo wget build-essential
+    - ./ci/debian/before_install.sh 6.0-beta1
   script:
     # prepare the build tree
-    - mkdir build
-    - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -S . -B build -DSFCGAL_BUILD_TESTS=ON
+    - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -S . -B build -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++
     # run the build inside the build wrapper
     - build-wrapper/build-wrapper-linux-x86-64 --out-dir bw-output cmake --build build/ --config Release
   artifacts:

CMakeLists.txt

@@ -48,9 +48,9 @@ endif(NOT MSVC)
 #-- include finders and co
 set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules;${CMAKE_MODULE_PATH}" )
 
-set( SFCGAL_VERSION_MAJOR 1 )
-set( SFCGAL_VERSION_MINOR 5 )
-set( SFCGAL_VERSION_PATCH 2 )
+set( SFCGAL_VERSION_MAJOR 2 )
+set( SFCGAL_VERSION_MINOR 0 )
+set( SFCGAL_VERSION_PATCH 0 )
 
 set( SFCGAL_VERSION "${SFCGAL_VERSION_MAJOR}.${SFCGAL_VERSION_MINOR}.${SFCGAL_VERSION_PATCH}" )