Merge branch 'master' into CORE-boost_mp_number-GF

.github/install.sh

@@ -1,11 +1,29 @@
 #!/bin/bash
+
+set -ex
+
 sudo apt-get update
-sudo apt-get install -y  libmpfr-dev \
- libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev \
- libqt5svg5-dev qttools5-dev qttools5-dev-tools libboost-dev libinsighttoolkit4-dev zsh
-#update cmake to 3.18.4
+sudo apt-get install -y \
+ libmpfr-dev \
+ libtbb-dev \
+ libmetis-dev \
+ libssh-dev \
+ libeigen3-dev \
+ qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev libqt5websockets5-dev \
+ libqt5svg5-dev qttools5-dev qttools5-dev-tools \
+ libboost-dev libboost-serialization-dev libboost-iostreams-dev libboost-filesystem-dev libboost-filesystem-dev \
+ libvtk9-dev libgdcm-tools libvtkgdcm-dev libunwind-dev \
+ libinsighttoolkit5-dev \
+ libceres-dev \
+ libglpk-dev \
+ libopencv-dev \
+ zsh \
+ qt6-base-dev qt6-declarative-dev libqt6svg6-dev libqt6websockets6-dev
+
+#update CMake
 sudo apt purge --auto-remove cmake
 cd /tmp
-wget https://cmake.org/files/v3.18/cmake-3.18.4-Linux-x86_64.sh
-sudo sh cmake-3.18.4-Linux-x86_64.sh --skip-license --prefix=/usr/local
-rm cmake-3.18.4-Linux-x86_64.sh
+CMAKE_VER=$(curl --silent https://cmake.org/files/LatestRelease/cmake-latest-files-v1.json | jq -r .version.string)
+wget https://cmake.org/files/LatestRelease/cmake-$CMAKE_VER-linux-x86_64.sh
+sudo sh cmake-*.sh --skip-license --prefix=/usr/local
+rm cmake-*.sh

.github/test.sh

@@ -3,11 +3,11 @@
 FACTOR=$1
 set -ex
 cd Polyhedron/demo
-LIST_OF_PLUGINS=$(/usr/local/bin/cmake --build . -t help | egrep 'plugin$' |& cut -d\  -f2)
+/usr/local/bin/cmake -S Polyhedron -B build -DCGAL_DIR=$2
+LIST_OF_PLUGINS=$(/usr/local/bin/cmake --build build -t help | egrep 'plugin$' |& cut -d\  -f2)
 PLUGINS_ARRAY=(${LIST_OF_PLUGINS});
 NB_OF_PLUGINS=${#PLUGINS_ARRAY[@]}
 DEL=$(($NB_OF_PLUGINS / 4))
-mkdir build
 cd build
-/usr/local/bin/cmake -DCGAL_DIR=$2 ../Polyhedron
-make -j2 ${PLUGINS_ARRAY[@]:$(($FACTOR * $DEL)):$((($FACTOR + 1) * $DEL))}
+NUM_PROCS=$(nproc)
+make -j${NUM_PROCS} ${PLUGINS_ARRAY[@]:$(($FACTOR * $DEL)):$((($FACTOR + 1) * $DEL))}

.github/workflows/Remove_labels.yml

@@ -10,7 +10,7 @@ jobs:
     name: remove label
     steps:
       - name: removelabel
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -21,7 +21,7 @@ jobs:
               name: "Tested",
             });
       - name: Post address
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: ${{ success() }}
         with:
           script: |

.github/workflows/build_doc.yml

@@ -16,7 +16,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         id: get_round
         with:
          result-encoding: string
@@ -38,7 +38,7 @@ jobs:
              }
            }
            return 'stop'
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         if: steps.get_round.outputs.result != 'stop'
         id: get_pr_number
         with:
@@ -49,7 +49,7 @@ jobs:
            return pr_number
 
       - name: Emoji-comment
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: steps.get_round.outputs.result != 'stop'
         with:
           script: |
@@ -60,7 +60,7 @@ jobs:
               content: 'rocket'
             })
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: "checkout branch"
         if: steps.get_round.outputs.result != 'stop'
         with:
@@ -75,7 +75,7 @@ jobs:
           sudo apt-get update && sudo apt-get install -y graphviz ssh bibtex2html
           sudo pip install lxml
           sudo pip install pyquery
-          wget --no-verbose -O doxygen_exe https://cgal.geometryfactory.com/~cgaltest/doxygen_1_8_13_patched/doxygen
+          wget --no-verbose -O doxygen_exe https://cgal.geometryfactory.com/~cgaltest/doxygen_1_9_6_patched/doxygen
           sudo mv doxygen_exe /usr/bin/doxygen
           sudo chmod +x /usr/bin/doxygen
           git config --global user.email "[email protected]"
@@ -104,8 +104,8 @@ jobs:
               echo "DoxygenError=No package affected." >> $GITHUB_OUTPUT
               exit 1
             fi
-            cd build_doc && make -j2 doc
-            make -j2 doc_with_postprocessing 2>tmp.log
+            cd build_doc && make -j$(nproc) doc
+            make -j$(nproc) doc_with_postprocessing 2>tmp.log
             if [ -s tmp.log ]; then
               content=`cat ./tmp.log`
               delimiter="$(openssl rand -hex 8)"
@@ -136,7 +136,7 @@ jobs:
           fi
 
       - name: Post address
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: ${{ success() && steps.get_round.outputs.result != 'stop' }}
         with:
           script: |
@@ -154,13 +154,13 @@ jobs:
       - name: Post error
         env:
           ERRORMSG: ${{steps.build_and_run.outputs.DoxygenError}}
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: ${{ failure() && steps.get_round.outputs.result != 'stop' }}
         with:
           script: |
             const error = process.env.ERRORMSG
             const job_url = `${context.serverUrl}/CGAL/cgal/actions/runs/${context.runId}`
-            const msg = "There was an error while building the doc: \n"+error + "\n" + job_url
+            const msg = "There was an error while building the doc: \n```\n"+error + "\n```\n" + job_url
             github.rest.issues.createComment({
               owner: "CGAL",
               repo: "cgal",

.github/workflows/checks.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install dependencies
       run: |
         .github/install.sh

.github/workflows/cmake-all.yml

@@ -11,25 +11,25 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install dependencies
       run: sudo apt-get install -y libboost-dev libboost-program-options-dev libmpfr-dev libeigen3-dev
     - name: configure all
       run: |
         set -e
-        mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON -DBUILD_TESTING=ON ..
+        mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON -DCGAL_ENABLE_TESTING=ON ..
         ctest -L Installation -j $(getconf _NPROCESSORS_ONLN)
 
-  cmake-testsuite-with-qt5:
+  cmake-testsuite-with-qt:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install dependencies
       run: sudo bash -e .github/install.sh
     - name: configure all
       run: |
         set -e
-        mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON -DBUILD_TESTING=ON ..
+        mkdir build && cd build && CXX=clang++ cmake -DWITH_examples=ON -DWITH_tests=ON -DWITH_demos=ON -DCGAL_ENABLE_TESTING=ON ..
         ctest -L Installation -j $(getconf _NPROCESSORS_ONLN)

.github/workflows/delete_doc.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: delete directory
       run: |
          set -x

.github/workflows/demo.yml

@@ -9,31 +9,31 @@ jobs:
   batch_1:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install dependencies
       run: .github/install.sh
     - name: run1
       run: ./.github/test.sh 0 ${{ github.workspace }}
   batch_2:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install dependencies
       run: .github/install.sh
     - name: run2
       run: ./.github/test.sh 1 ${{ github.workspace }}
   batch_3:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install dependencies
       run: .github/install.sh
     - name: run3
       run: ./.github/test.sh 2 ${{ github.workspace }}
   batch_4:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install dependencies
       run: .github/install.sh
     - name: run4

.github/workflows/filter_testsuite.yml

@@ -14,7 +14,7 @@ jobs:
     if: (github.event.comment.user.login == 'sloriot' || github.event.comment.user.login == 'lrineau') && contains(github.event.comment.body, '/testme')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         id: get_label
         with:
          result-encoding: string
@@ -63,7 +63,7 @@ jobs:
             ssh ${HOST} "${PATH_TO_SCRIPT}/run_testsuite_from_branch_name.sh $USER_NAME $BRANCH_NAME $BASE $PR_NUMBER"
           done
       - name: Post address
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const address = "Testsuite launched. Results will appear on the following page: https://cgal.geometryfactory.com/~cgaltest/test_suite/TESTRESULTS/index.shtml "

.github/workflows/list_workflow_last_run.yml

@@ -12,7 +12,7 @@
         messages: ${{ steps.cat_output.outputs.message }}
       steps:
         - name: checkout
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
         - name: run script
           run: |
             chmod +x ./Scripts/developer_scripts/list_cgal_workflows_last_run.sh

.github/workflows/reuse.yml

@@ -0,0 +1,35 @@
+# SPDX-FileCopyrightText: 2020 Free Software Foundation Europe e.V. <https://fsfe.org>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+name: REUSE Compliance Check
+
+on: [push, pull_request]
+
+jobs:
+  reuse:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: REUSE version
+      uses: fsfe/reuse-action@v2
+      with:
+        args: --version
+    - name: REUSE lint
+      uses: fsfe/reuse-action@v2
+      with:
+        args: --include-submodules lint
+    - name: REUSE SPDX SBOM
+      uses: fsfe/reuse-action@v2
+      with:
+        args: spdx
+    - name: install dependencies
+      run: sudo apt-get install -y cmake
+    - name: Create CGAL internal release
+      run: |
+        mkdir -p ./release
+        cmake -DDESTINATION=./release -DCGAL_VERSION=9.9 -P ./Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
+    - name: REUSE lint release tarball
+      uses: fsfe/reuse-action@v2
+      with:
+        args: --root ./release/CGAL-9.9 --include-submodules lint

.github/workflows/wiki_notification.yml

@@ -9,7 +9,7 @@ jobs:
       messages: ${{ steps.set-result.outputs.result }}
     steps:
     - name: get informations and prepare email
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       id: set-result
       with:
         result-encoding: string

.gitignore

@@ -178,12 +178,6 @@ GraphicsView/demo/Triangulation_2/Makefile
 GraphicsView/demo/Triangulation_2/Regular_triangulation_2
 GraphicsView/demo/Triangulation_2/qrc_*.cxx
 GraphicsView/demo/Triangulation_2/ui_*.h
-GraphicsView/src/CGAL_Qt5/*.dll
-GraphicsView/src/CGAL_Qt5/*.lib
-GraphicsView/src/CGAL_Qt5/*.so
-GraphicsView/src/CGAL_Qt5/Makefile
-GraphicsView/src/CGAL_Qt5/moc_*.cxx
-GraphicsView/src/CGAL_Qt5/qrc_*.cxx
 HalfedgeDS/test/HalfedgeDS/cgal_test_with_cmake
 HalfedgeDS/test/HalfedgeDS/test_hds
 HalfedgeDS/test/HalfedgeDS/test_hds_decorator
@@ -879,7 +873,6 @@ Surface_mesher/demo/Surface_mesher/.*.deps
 Surface_mesher/demo/Surface_mesher/.qglviewer.xml
 Surface_mesher/demo/Surface_mesher/Makefile
 Surface_mesher/demo/Surface_mesher/Surface_mesher
-Surface_mesher/demo/Surface_mesher/Surface_mesher_Qt5_Demo
 Surface_mesher/demo/Surface_mesher/VTK/Makefile
 Surface_mesher/demo/Surface_mesher/VTK/mesh_a_3D_image
 Surface_mesher/demo/Surface_mesher/VTK/mesh_a_VTK_3D_image
@@ -894,7 +887,6 @@ Surface_mesher/demo/Surface_mesher/out*.off
 Surface_mesher/demo/Surface_mesher/polyhedron_remesher
 Surface_mesher/demo/Surface_mesher/polyhedron_remesher_with_edges
 Surface_mesher/demo/Surface_mesher/qrc_*.c*
-Surface_mesher/demo/Surface_mesher/qt5-demo
 Surface_mesher/demo/Surface_mesher/ui_*.h
 Surface_mesher/doxygen
 Surface_mesher/examples/Surface_mesher/.*.deps
@@ -1212,3 +1204,4 @@ gmon.*
 Polygonal_surface_reconstruction/examples/build*
 Polygonal_surface_reconstruction/test/build*
 Solver_interface/examples/build*
+/Mesh_3/examples/Mesh_3/indicator_0.inr.gz

.reuse/dep5

@@ -0,0 +1,12 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: CGAL
+Upstream-Contact: CGAL Editorial Board <[email protected]>
+Source: https://github.com/CGAL/cgal
+
+Files: .* *.cmake *.md .github/* Maintenance/* */TODO */doc/* */deb/* */applications/* */doc_html/* */scripts/* */developer_scripts/* */demo/* */examples/* */src/* */test/* */benchmarks/* */benchmark/* */package_info/* */data/* */cmake/*
+Copyright: 1995-2023 The CGAL Project
+License: CC0-1.0
+
+Files: CMakeLists.txt GraphicsView/include/CGAL/Qt/ImageInterface.ui GraphicsView/include/CGAL/Qt/resources/qglviewer-icon.xpm Installation/AUTHORS Installation/CMakeLists.txt Installation/README Installation/auxiliary/cgal_create_cmake_script.1 Installation/auxiliary/gmp/README Installation/include/CGAL/license/gpl_package_list.txt MacOSX/auxiliary/cgal_app.icns copyright
+Copyright: 1995-2023 The CGAL Project
+License: CC0-1.0

AABB_tree/demo/AABB_tree/AABB_demo.cpp

@@ -30,7 +30,7 @@ int main(int argc, char **argv)
   app.setOrganizationName("INRIA");
   app.setApplicationName("AABB tree demo");
 
-  // Import resources from libCGALQt (Qt5).
+  // Import resources from libCGALQt (Qt6).
   CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
@@ -49,12 +49,3 @@ int main(int argc, char **argv)
 
   return app.exec();
 }
-
-#  include "Scene.cpp"
-#  include "Scene_moc.cpp"
-#  include "benchmarks.cpp"
-#  include "Viewer.cpp"
-#  include "Viewer_moc.cpp"
-#  include "MainWindow.cpp"
-#  include "MainWindow_moc.cpp"
-