Merge remote-tracking branch 'origin/master' into python3

CGAL · Jun 22, 2023 · 5f924ed · 5f924ed
2 parents 5d64a97 + d7b5ea6
commit 5f924ed
Show file tree

Hide file tree

Showing 52 changed files with 262 additions and 311 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
 
  steps:
  - name: Git checkout
- uses: actions/checkout@v1
+ uses: actions/checkout@v3
 
  - name: Compile images
  run: bash -x ./test.sh ${{ matrix.test_platform }}

diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.pyc
 /secret.txt
 /secret.file
+testsuite/*
diff --git a/ArchLinux-CXX14/Dockerfile b/ArchLinux-CXX14/Dockerfile
@@ -3,6 +3,6 @@ ARG dockerfile_url
 ENV DOCKERFILE_URL=$dockerfile_url
 
 ENV CGAL_TEST_PLATFORM="ArchLinux-CXX14"
-ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-DCMAKE_POLICY_DEFAULT_CMP0053=OLD\" \"-DCGAL_HEADER_ONLY=OFF\" \"-DLEDA_INCLUDE_DIR=/usr/include/LEDA\" \"-DCGAL_CXX_FLAGS=-Wall -std=gnu++14\")"
+ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_HEADER_ONLY=OFF\" \"-DCGAL_CXX_FLAGS=-Wall -std=gnu++14\")"
 ENV INIT_FILE=/tmp/init.cmake
 COPY init.cmake /tmp/init.cmake
diff --git a/ArchLinux-CXX17-Release/Dockerfile b/ArchLinux-CXX17-Release/Dockerfile
@@ -3,6 +3,6 @@ ARG dockerfile_url
 ENV DOCKERFILE_URL=$dockerfile_url
 
 ENV CGAL_TEST_PLATFORM="ArchLinux-CXX17-Release"
-ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-DCMAKE_POLICY_DEFAULT_CMP0053=OLD\" \"-DLEDA_INCLUDE_DIR=/usr/include/LEDA\" \"-DCMAKE_CXX_FLAGS=-Wall -O3 -msse4.1 -std=gnu++17\")"
+ENV CGAL_CMAKE_FLAGS="(\"-DCMAKE_CXX_FLAGS=-Wall -O3 -msse4.1 -std=gnu++17\")"
 ENV INIT_FILE=/tmp/init.cmake
 COPY init.cmake /tmp/init.cmake
diff --git a/ArchLinux-CXX17-Release/init.cmake b/ArchLinux-CXX17-Release/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -O3 -msse4.1 -std=gnu++17" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
diff --git a/ArchLinux-clang-CXX14/Dockerfile b/ArchLinux-clang-CXX14/Dockerfile
@@ -3,6 +3,6 @@ ARG dockerfile_url
 ENV DOCKERFILE_URL=$dockerfile_url
 
 ENV CGAL_TEST_PLATFORM="ArchLinux-clang-CXX14"
-ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-DCMAKE_POLICY_DEFAULT_CMP0053=OLD\" \"-DLEDA_INCLUDE_DIR=/usr/include/LEDA\" \"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCGAL_CXX_FLAGS=-Wall -std=c++14\")" CXX=/bin/clang++ CC=/bin/clang
+ENV CGAL_CMAKE_FLAGS="(\"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCGAL_CXX_FLAGS=-Wall -std=c++14\")" CXX=/bin/clang++ CC=/bin/clang
 ENV INIT_FILE=/tmp/init.cmake
 COPY init.cmake /tmp/init.cmake
diff --git a/ArchLinux-clang-CXX17-Release/Dockerfile b/ArchLinux-clang-CXX17-Release/Dockerfile
@@ -3,6 +3,6 @@ ARG dockerfile_url
 ENV DOCKERFILE_URL=$dockerfile_url
 
 ENV CGAL_TEST_PLATFORM="ArchLinux-clang-CXX17-Release"
-ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-DCMAKE_POLICY_DEFAULT_CMP0053=OLD\" \"-DLEDA_INCLUDE_DIR=/usr/include/LEDA\" \"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCMAKE_CXX_FLAGS=-Wall -O3 -std=c++17\")" CXX=/bin/clang++ CC=/bin/clang
+ENV CGAL_CMAKE_FLAGS="(\"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCMAKE_CXX_FLAGS=-Wall -O3 -std=c++17\")" CXX=/bin/clang++ CC=/bin/clang
 ENV INIT_FILE=/tmp/init.cmake
 COPY init.cmake /tmp/init.cmake
diff --git a/ArchLinux-clang-CXX20-Release/Dockerfile b/ArchLinux-clang-CXX20-Release/Dockerfile
@@ -3,7 +3,7 @@ ARG dockerfile_url
 ENV DOCKERFILE_URL=$dockerfile_url
 
 ENV CGAL_TEST_PLATFORM="ArchLinux-clang-CXX20-Release"
-ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-DCMAKE_POLICY_DEFAULT_CMP0053=OLD\" \"-DLEDA_INCLUDE_DIR=/usr/include/LEDA\" \"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCMAKE_CXX_FLAGS=-Wall -O3 -std=c++20\" \"-DCMAKE_PREFIX_PATH=/usr/local/boost\")" CXX=/bin/clang++ CC=/bin/clang
+ENV CGAL_CMAKE_FLAGS="(\"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCMAKE_CXX_FLAGS=-Wall -O3 -std=c++20\" \"-DCMAKE_PREFIX_PATH=/usr/local/boost\")" CXX=/bin/clang++ CC=/bin/clang
 ENV INIT_FILE=/tmp/init.cmake
 COPY init.cmake /tmp/init.cmake
 

diff --git a/ArchLinux-clang-Release/Dockerfile b/ArchLinux-clang-Release/Dockerfile
@@ -3,6 +3,6 @@ ARG dockerfile_url
 ENV DOCKERFILE_URL=$dockerfile_url
 
 ENV CGAL_TEST_PLATFORM="ArchLinux-clang-Release"
-ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-O3 -DCGAL_NDEBUG' '-DWITH_CGAL_Qt3:BOOL=OFF' '-DCMAKE_POLICY_DEFAULT_CMP0053=OLD' '-DLEDA_INCLUDE_DIR=/usr/include/LEDA' '-DCMAKE_C_COMPILER:FILEPATH=/bin/clang' '-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++' '-DCGAL_CXX_FLAGS=-Wall -march=native' '-DWITH_GMPXX:BOOL=ON')" CXX=/bin/clang++ CC=/bin/clang
+ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-O3 -DCGAL_NDEBUG' '-DCMAKE_C_COMPILER:FILEPATH=/bin/clang' '-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++' '-DCGAL_CXX_FLAGS=-Wall -march=native' '-DWITH_GMPXX:BOOL=ON')" CXX=/bin/clang++ CC=/bin/clang
 ENV INIT_FILE=/tmp/init.cmake
 COPY init.cmake /tmp/init.cmake
diff --git a/ArchLinux-clang-svn/Dockerfile b/ArchLinux-clang-svn/Dockerfile
@@ -41,6 +41,6 @@ RUN pacman --noconfirm -U llvm-svn/*.pkg.tar.zst && rm -rf llvm-svn
 ENV CC=clang
 ENV CXX=clang++
 ENV CGAL_TEST_PLATFORM="ArchLinux-clang-svn"
-ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-Wall -Wextra -std=c++14 -stdlib=libc++\" \"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-DCMAKE_POLICY_DEFAULT_CMP0053=OLD\" \"-DLEDA_INCLUDE_DIR=/usr/include/LEDA\")"
+ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-Wall -Wextra -std=c++14 -stdlib=libc++\")"
 ENV INIT_FILE=/tmp/init.cmake
 COPY init.cmake /tmp/init.cmake
diff --git a/ArchLinux-clang/Dockerfile b/ArchLinux-clang/Dockerfile
@@ -5,6 +5,6 @@ ENV DOCKERFILE_URL=$dockerfile_url
 RUN pacman -Syyu --noconfirm && pacman -S --noconfirm clang && pacman -Scc --noconfirm
 
 ENV CGAL_TEST_PLATFORM="ArchLinux-clang"
-ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-DCMAKE_POLICY_DEFAULT_CMP0053=OLD\" \"-DLEDA_INCLUDE_DIR=/usr/include/LEDA\" \"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCGAL_CXX_FLAGS=-Wall\")" CXX=/bin/clang++ CC=/bin/clang
+ENV CGAL_CMAKE_FLAGS="(\"-DCMAKE_CXX_FLAGS_DEBUG="" \" \"-DCMAKE_C_COMPILER:FILEPATH=/bin/clang\" \"-DCMAKE_CXX_COMPILER:FILEPATH=/bin/clang++\" \"-DCGAL_CXX_FLAGS=-Wall\")" CXX=/bin/clang++ CC=/bin/clang
 ENV INIT_FILE=/tmp/init.cmake
 COPY init.cmake /tmp/init.cmake
diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile
@@ -4,7 +4,7 @@ ENV DOCKERFILE_URL=$dockerfile_url
 
 # Install additional packages beyond the baseline.
 # Install dependencies of the AUR (user repository) packages to be built from source later
-# ipe: freetype2, lua, poppler, python2, zlib
+# ipe: freetype2, lua, poppler, python3, zlib
 # leda-free: tcsh
 # and clean up the package cache
 RUN pacman --noconfirm -Syu archlinux-keyring
@@ -17,22 +17,23 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
  glew glu mesa \
  gmp mpfr mpfi ntl \
  qt5-base qt5-script qt5-svg qt5-tools \
- intel-tbb \
+ qt6-base qt6-tools qt6-svg qt6-websockets\
+ intel-tbb \
  && pacman -S --needed --noconfirm --asdeps \
- freetype2 lua poppler python2 zlib \
+ freetype2 lua poppler python3 zlib \
  tcsh \
  && pacman -Scc
 #Install latest cmake from the `next` branch on github
 RUN git clone https://github.com/Kitware/CMake.git --depth 1 \
- && cd ./CMake \
- && git branch next \
- && mkdir build \
- && cd build \
- && env CC=cc CXX=c++ ../bootstrap \
- && make -j"$(nproc)" \
- && make install \
- && cd ../.. \
- && rm -rf ./CMake
+  && cd ./CMake \
+  && git branch next \
+  && mkdir build \
+  && cd build \
+  && env CC=cc CXX=c++ ../bootstrap \
+  && make -j"$(nproc)" \
+  && make install \
+  && cd ../.. \
+  && rm -rf ./CMake
 
 # create a group for building AUR (user contributed) packages from sources
 # (not allowed as root for security reasons)
@@ -63,18 +64,18 @@ WORKDIR /tmp/makepkg
 RUN pacman -U --noconfirm *.pkg.tar.zst && \
  rm *.pkg.tar.zst
 
- RUN pacman -Sy --noconfirm unzip \
- && cd /tmp \
- && curl -sSL "https://github.com/CGAL/LAStools/archive/LAStools-2020-11-09.zip" -o master.zip \
- && unzip master.zip \
- && cd ./LAStools-LAStools-2020-11-09 \
- && cmake -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++ -DCMAKE_CXX_FLAGS=-std=c++11 . \
- && make -j "$(nproc)" \
- && make install \
- && cd .. \
- && rm -rf LAStools-LAStools-2020-11-09 \
- && rm -rf master.zip \
- && pacman -Scc
+RUN pacman -Sy --noconfirm unzip \
+  && cd /tmp \
+  && curl -sSL "https://github.com/CGAL/LAStools/archive/LAStools-2020-11-09.zip" -o master.zip \
+  && unzip master.zip \
+  && cd ./LAStools-LAStools-2020-11-09 \
+  && cmake -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++ -DCMAKE_CXX_FLAGS=-std=c++11 . \
+  && make -j "$(nproc)" \
+  && make install \
+  && cd .. \
+  && rm -rf LAStools-LAStools-2020-11-09 \
+  && rm -rf master.zip \
+  && pacman -Scc
 
 # LEDA includes are in a nonstandard location (/usr/include/LEDA/LEDA/...
 # instead of just /usr/include/LEDA/...) in Stephan Friedrich's AUR package,
@@ -84,7 +85,6 @@ RUN pacman -U --noconfirm *.pkg.tar.zst && \
 # run by the testsuite.
 #
 ENV CGAL_TEST_PLATFORM="ArchLinux" \
- CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-DCMAKE_POLICY_DEFAULT_CMP0053=OLD\")" \
  LEDA_INC_DIR=/usr/include/LEDA
 ENV INIT_FILE=/tmp/init.cmake
 COPY init.cmake /tmp/init.cmake
diff --git a/ArchLinux/init.cmake b/ArchLinux/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "")

diff --git a/CentOS-5/Dockerfile b/CentOS-5/Dockerfile
diff --git a/CentOS-5/init.cmake b/CentOS-5/init.cmake
diff --git a/CentOS-6-32/Dockerfile b/CentOS-6-32/Dockerfile
diff --git a/CentOS-6-32/init.cmake b/CentOS-6-32/init.cmake
diff --git a/CentOS-6-CXX11-Boost157/Dockerfile b/CentOS-6-CXX11-Boost157/Dockerfile
diff --git a/CentOS-6-CXX11-Boost157/init.cmake b/CentOS-6-CXX11-Boost157/init.cmake
diff --git a/CentOS-6/Dockerfile b/CentOS-6/Dockerfile
diff --git a/CentOS-6/init.cmake b/CentOS-6/init.cmake
diff --git a/CentOS-7/Dockerfile b/CentOS-7/Dockerfile
@@ -21,6 +21,9 @@ RUN yum -y update; yum -y install \
  qt5-qtscript-devel.x86_64 \
  qt5-qtsvg-devel.x86_64 \
  qt5-qttools-devel.x86_64 \
+ qt6-qtbase-devel.x86_64 \
+ qt6-qtsvg-devel.x86_64 \
+ qt6-qttools-devel.x86_64 \
  tar \
  zlib-devel.x86_64; yum clean all
 
@@ -31,11 +34,6 @@ RUN cd /usr \
 RUN cd /usr \
 && ./cmake.sh --skip-license
 
-RUN cd /etc/yum.repos.d/ && \
- curl -s -SLO https://copr.fedoraproject.org/coprs/rineau/libQGLViewer-qt5/repo/epel-7/rineau-libQGLViewer-qt5-epel-7.repo && \
- rpm --import https://copr-be.cloud.fedoraproject.org/results/rineau/libQGLViewer-qt5/pubkey.gpg && \
- yum -y install libQGLViewer-qt5-devel.x86_64; yum clean all
-
 #
 # The CMAKE_GENERATOR trick is used to pass a CMake variable to each CMake
 # run by the testsuite.