From 66ffa651bf7bb7723363ecd3f1faee6ff191eda5 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 29 Sep 2022 15:04:47 +0200 Subject: [PATCH 01/33] Update to Python3 --- .gitignore | 1 + ArchLinux/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cc1a720..3ae663e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.pyc /secret.txt /secret.file +testsuite/* diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile index 956f4ed..d426445 100644 --- 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 @@ -19,7 +19,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \ qt5-base qt5-script qt5-svg qt5-tools \ 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 From 4e1de9e55f77c044e12765581005c5746016976d Mon Sep 17 00:00:00 2001 From: Nicolas Saillant Date: Thu, 29 Sep 2022 15:38:26 +0200 Subject: [PATCH 02/33] Add a platform with clang compiled from git --- Debian-testing-clang-main/Dockerfile | 17 +++++++++++++++++ push.sh | 1 + test.sh | 1 + 3 files changed, 19 insertions(+) create mode 100644 Debian-testing-clang-main/Dockerfile diff --git a/Debian-testing-clang-main/Dockerfile b/Debian-testing-clang-main/Dockerfile new file mode 100644 index 0000000..7782e2b --- /dev/null +++ b/Debian-testing-clang-main/Dockerfile @@ -0,0 +1,17 @@ +FROM cgal/testsuite-docker:debian-testing +ARG dockerfile_url +ENV DOCKERFILE_URL=$dockerfile_url + +RUN apt-get update -y \ +&& apt-get install wget \ +&& apt-get install -y software-properties-common \ +&& apt-get clean all \ +&& cd .. && wget https://apt.llvm.org/llvm.sh \ +&& chmod +x llvm.sh \ +&& ./llvm.sh 16 \ +&& rm ./llvm.sh + +ENV CXX=/usr/bin/clang++-16 +ENV CC=/usr/bin/clang-16 +ENV CGAL_TEST_PLATFORM="Debian-testing-clang-main" + diff --git a/push.sh b/push.sh index 22d6a76..f0a8582 100644 --- a/push.sh +++ b/push.sh @@ -40,6 +40,7 @@ then elif [ "$1" = Debian-testing ] then docker push cgal/testsuite-docker:debian-testing + docker push cgal/testsuite-docker:debian-testing-clang-main elif [ "$1" = Fedora ] then docker push cgal/testsuite-docker:fedora diff --git a/test.sh b/test.sh index c51d3ed..415c667 100755 --- a/test.sh +++ b/test.sh @@ -62,6 +62,7 @@ then elif [ "$1" = Debian-testing ] then dockerbuild debian-testing Debian-testing + dockerbuild debian-testing-clang-main Debian-testing-clang-main elif [ "$1" = Fedora ] then dockerbuild fedora Fedora From f6ce36466e8b206cfc9106209aeb1a3b1a6960b7 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 19 Oct 2022 10:19:38 +0200 Subject: [PATCH 03/33] Add dependabot for Github Actions [no ci] --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..5ace460 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From d367b8e60fa4ab191b3f5005a43bc90b85da1ba5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 08:24:50 +0000 Subject: [PATCH 04/33] Bump actions/checkout from 1 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 1 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v1...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e57d1e2..c10c8c5 100644 --- 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 }} From 27cf22cf1c60a3eebbecb04e1b19359ee8bffda3 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 14 Nov 2022 11:18:07 +0100 Subject: [PATCH 05/33] =?UTF-8?q?Fedora-32=20needs=20tbb-devel=20for=2032?= =?UTF-8?q?=C2=A0bits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Fedora-32/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 8b633fe..4f3b728 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -29,7 +29,7 @@ RUN dnf -y install \ qt5-qtsvg-devel.i686 \ qt5-qttools-devel.i686 \ tar \ - tbb-devel \ + tbb-devel.i686 \ diffutils \ zlib-devel.i686 && dnf clean all From dc47178bd16451e19e5550200498cc0637b196a5 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 24 Nov 2022 16:19:49 +0100 Subject: [PATCH 06/33] Use dnf with the --refresh option --- Fedora-rawhide/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 3ecda09..640179f 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -22,7 +22,7 @@ RUN rpm --import https://src.fedoraproject.org/rpms/fedora-repos/blob/main/f/RPM tar" >> dnf-cmd && \ echo update >> dnf-cmd && \ echo run >> dnf-cmd && \ - dnf -y shell dnf-cmd && rm dnf-cmd && \ + dnf -y --refresh shell dnf-cmd && rm dnf-cmd && \ dnf clean all ENV CGAL_TEST_PLATFORM="Fedora-rawhide" From f49fddf631eea9b526a0e9952299877449decc50 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 29 Nov 2022 11:12:08 +0100 Subject: [PATCH 07/33] Reformat whitespace --- ArchLinux/Dockerfile | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile index d426445..797e3d6 100644 --- a/ArchLinux/Dockerfile +++ b/ArchLinux/Dockerfile @@ -17,22 +17,22 @@ 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 \ + intel-tbb \ && pacman -S --needed --noconfirm --asdeps \ 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 +63,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, From b7b78ed7fd24e578b95b0656cc4c78aee26aa0b2 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 29 Nov 2022 11:12:28 +0100 Subject: [PATCH 08/33] Get mpfr-4.1.1.p1 from testing --- ArchLinux/Dockerfile | 13 +++++++++++-- ArchLinux/pacman.sed | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 ArchLinux/pacman.sed diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile index 797e3d6..85632b5 100644 --- a/ArchLinux/Dockerfile +++ b/ArchLinux/Dockerfile @@ -1,3 +1,9 @@ +FROM archlinux:base-devel as get-testing-mpfr +COPY pacman.sed . +RUN sed -i -f pacman.sed /etc/pacman.conf +RUN pacman --noconfirm -Syu archlinux-keyring +RUN pacman -Sy + FROM archlinux:base-devel ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url @@ -8,14 +14,17 @@ ENV DOCKERFILE_URL=$dockerfile_url # leda-free: tcsh # and clean up the package cache RUN pacman --noconfirm -Syu archlinux-keyring -RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \ +COPY --from=get-testing-mpfr /var/cache/pacman/pkg/mpfr-4.1.1.p1-1-x86_64.pkg.tar.zst . +RUN pacman -Syu --noconfirm \ + && pacman -U --noconfirm mpfr-4.1.1.p1-1-x86_64.pkg.tar.zst \ + && pacman -S --needed --noconfirm \ base-devel \ coreutils \ git \ boost \ eigen \ glew glu mesa \ - gmp mpfr mpfi ntl \ + gmp mpfi ntl \ qt5-base qt5-script qt5-svg qt5-tools \ intel-tbb \ && pacman -S --needed --noconfirm --asdeps \ diff --git a/ArchLinux/pacman.sed b/ArchLinux/pacman.sed new file mode 100644 index 0000000..d6870cc --- /dev/null +++ b/ArchLinux/pacman.sed @@ -0,0 +1,2 @@ +/\[core\]/ i[testing]\ +Include = /etc/pacman.d/mirrorlist\ From 32fd816fb3555a3a4a84a8b49b5389a07ec7e615 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 12 Dec 2022 10:58:25 +0100 Subject: [PATCH 09/33] Revert "Get mpfr-4.1.1.p1 from testing" This reverts commit b7b78ed7fd24e578b95b0656cc4c78aee26aa0b2. --- ArchLinux/Dockerfile | 13 ++----------- ArchLinux/pacman.sed | 2 -- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 ArchLinux/pacman.sed diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile index 85632b5..797e3d6 100644 --- a/ArchLinux/Dockerfile +++ b/ArchLinux/Dockerfile @@ -1,9 +1,3 @@ -FROM archlinux:base-devel as get-testing-mpfr -COPY pacman.sed . -RUN sed -i -f pacman.sed /etc/pacman.conf -RUN pacman --noconfirm -Syu archlinux-keyring -RUN pacman -Sy - FROM archlinux:base-devel ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url @@ -14,17 +8,14 @@ ENV DOCKERFILE_URL=$dockerfile_url # leda-free: tcsh # and clean up the package cache RUN pacman --noconfirm -Syu archlinux-keyring -COPY --from=get-testing-mpfr /var/cache/pacman/pkg/mpfr-4.1.1.p1-1-x86_64.pkg.tar.zst . -RUN pacman -Syu --noconfirm \ - && pacman -U --noconfirm mpfr-4.1.1.p1-1-x86_64.pkg.tar.zst \ - && pacman -S --needed --noconfirm \ +RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \ base-devel \ coreutils \ git \ boost \ eigen \ glew glu mesa \ - gmp mpfi ntl \ + gmp mpfr mpfi ntl \ qt5-base qt5-script qt5-svg qt5-tools \ intel-tbb \ && pacman -S --needed --noconfirm --asdeps \ diff --git a/ArchLinux/pacman.sed b/ArchLinux/pacman.sed deleted file mode 100644 index d6870cc..0000000 --- a/ArchLinux/pacman.sed +++ /dev/null @@ -1,2 +0,0 @@ -/\[core\]/ i[testing]\ -Include = /etc/pacman.d/mirrorlist\ From 62671d54b502a80a556f424626498cf59f25b9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 20 Dec 2022 09:36:18 +0100 Subject: [PATCH 10/33] clean up antiquity --- ArchLinux-CXX14/Dockerfile | 2 +- ArchLinux-CXX17-Release/Dockerfile | 2 +- ArchLinux-clang-CXX14/Dockerfile | 2 +- ArchLinux-clang-CXX17-Release/Dockerfile | 2 +- ArchLinux-clang-CXX20-Release/Dockerfile | 2 +- ArchLinux-clang-Release/Dockerfile | 2 +- ArchLinux-clang-svn/Dockerfile | 2 +- ArchLinux-clang/Dockerfile | 2 +- ArchLinux/Dockerfile | 1 - CentOS-6-32/Dockerfile | 16 ---------------- CentOS-6-CXX11-Boost157/Dockerfile | 2 +- CentOS-6/Dockerfile | 7 ------- CentOS-7/Dockerfile | 5 ----- Debian-stable-Release/Dockerfile | 2 +- Debian-stable/Dockerfile | 2 +- Debian-testing/Dockerfile | 2 -- Fedora-32/Dockerfile | 4 +--- Fedora-rawhide/Dockerfile | 1 - Fedora-strict-ansi/Dockerfile | 2 +- Fedora/Dockerfile | 1 - Ubuntu-CXX11/Dockerfile | 2 +- Ubuntu-GCC6-CXX1Z/Dockerfile | 2 +- Ubuntu-GCC6-Release/Dockerfile | 2 +- Ubuntu-GCC6/Dockerfile | 2 +- Ubuntu-GCC_master_cpp20-Release/Dockerfile | 2 +- Ubuntu-NO_DEPRECATED_CODE/Dockerfile | 2 +- Ubuntu/Dockerfile | 2 +- test_container/CMakeLists.txt | 9 --------- 28 files changed, 20 insertions(+), 64 deletions(-) diff --git a/ArchLinux-CXX14/Dockerfile b/ArchLinux-CXX14/Dockerfile index 754c707..9ef6d54 100644 --- 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 index 6d8a804..14fc756 100644 --- 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-clang-CXX14/Dockerfile b/ArchLinux-clang-CXX14/Dockerfile index 9fc32ed..bf820bf 100644 --- 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 index 4d6d3b4..ed3988e 100644 --- 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 index 414b8a9..cae8b03 100644 --- 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 index fd46d1d..ad6352c 100644 --- 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 index 62c9ccc..e6d4a02 100644 --- 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 index b0b8b3a..2a13f83 100644 --- 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 index 797e3d6..a82f249 100644 --- a/ArchLinux/Dockerfile +++ b/ArchLinux/Dockerfile @@ -84,7 +84,6 @@ RUN pacman -Sy --noconfirm unzip \ # 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/CentOS-6-32/Dockerfile b/CentOS-6-32/Dockerfile index 6d5c3ce..1c6a2e6 100644 --- a/CentOS-6-32/Dockerfile +++ b/CentOS-6-32/Dockerfile @@ -40,24 +40,8 @@ RUN curl -s -SL http://sourceforge.net/projects/boost/files/boost/${BOOST_MAJOR} --prefix=/usr/local/ install && \ cd .. && rm -rf boost_* -ENV QGL_REPO_32="\n[rineau-libQGLViewer-qt5-i386]\n\ -name=Copr repo for libQGLViewer-qt5 owned by rineau (i386)\n\ -baseurl=https://copr-be.cloud.fedoraproject.org/results/rineau/libQGLViewer-qt5/epel-6-i386/\n\ -skip_if_unavailable=True\n\ -gpgcheck=1\n\ -gpgkey=https://copr-be.cloud.fedoraproject.org/results/rineau/libQGLViewer-qt5/pubkey.gpg\n\ -enabled=1\n\ -enabled_metadata=1" - -RUN cd /etc/yum.repos.d/ && \ - curl -s -SLO https://copr.fedoraproject.org/coprs/rineau/libQGLViewer-qt5/repo/epel-6/rineau-libQGLViewer-qt5-epel-6.repo && \ - rpm --import https://copr-be.cloud.fedoraproject.org/results/rineau/libQGLViewer-qt5/pubkey.gpg && \ - echo -e "$QGL_REPO_32" >> rineau-libQGLViewer-qt5-epel-6.repo && \ - yum -y install libQGLViewer-qt5-devel.i686 - ENV CC="gcc -m32" CXX="g++ -m32" ENV CGAL_TEST_PLATFORM="CentOS6-32" -ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/CentOS-6-CXX11-Boost157/Dockerfile b/CentOS-6-CXX11-Boost157/Dockerfile index 43255ca..bb08f62 100644 --- a/CentOS-6-CXX11-Boost157/Dockerfile +++ b/CentOS-6-CXX11-Boost157/Dockerfile @@ -13,6 +13,6 @@ RUN cd boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH} && \ ./b2 cxxflags="-std=c++0x" linkflags="-std=c++0x" --prefix=/usr/local/ install ENV CGAL_TEST_PLATFORM="CentOS6-CXX11-Boost157" -ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-DCGAL_CXX_FLAGS=-Wall -std=c++0x\")" +ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-Wall -std=c++0x\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/CentOS-6/Dockerfile b/CentOS-6/Dockerfile index dd406da..66d8380 100644 --- a/CentOS-6/Dockerfile +++ b/CentOS-6/Dockerfile @@ -30,14 +30,7 @@ RUN curl -s -SL http://sourceforge.net/projects/boost/files/boost/${BOOST_MAJOR} ./b2 -d0 --prefix=/usr/local/ install && \ cd .. && rm -rf boost_* -RUN cd /etc/yum.repos.d/ && \ - curl -s -SLO https://copr.fedoraproject.org/coprs/rineau/libQGLViewer-qt5/repo/epel-6/rineau-libQGLViewer-qt5-epel-6.repo && \ - rpm --import https://copr-be.cloud.fedoraproject.org/results/rineau/libQGLViewer-qt5/pubkey.gpg && \ - yum -y install libQGLViewer-qt5-devel.x86_64 libQGLViewer-devel.x86_64 && \ - yum clean all - ENV CGAL_TEST_PLATFORM="CentOS6" -ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/CentOS-7/Dockerfile b/CentOS-7/Dockerfile index 0bebe55..6fdc115 100644 --- a/CentOS-7/Dockerfile +++ b/CentOS-7/Dockerfile @@ -31,11 +31,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. diff --git a/Debian-stable-Release/Dockerfile b/Debian-stable-Release/Dockerfile index c587acc..73c175c 100644 --- a/Debian-stable-Release/Dockerfile +++ b/Debian-stable-Release/Dockerfile @@ -3,6 +3,6 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Debian-stable-Release" -ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-O3 -DCGAL_NDEBUG' '-DWITH_CGAL_Qt3:BOOL=OFF')" +ENV CGAL_CMAKE_FLAGS="('-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_CXX_FLAGS_RELEASE=-O3 -DCGAL_NDEBUG')" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Debian-stable/Dockerfile b/Debian-stable/Dockerfile index c8b5fb2..cbbf351 100644 --- a/Debian-stable/Dockerfile +++ b/Debian-stable/Dockerfile @@ -22,6 +22,6 @@ RUN apt-get update && apt-get install -y \ curl ENV CGAL_TEST_PLATFORM="Debian-Stable" -ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF -DWITH_CGAL_Qt5=OFF \")" +ENV CGAL_CMAKE_FLAGS="(-DWITH_CGAL_Qt5=OFF \")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index cf219b8..66f25eb 100644 --- a/Debian-testing/Dockerfile +++ b/Debian-testing/Dockerfile @@ -15,7 +15,6 @@ RUN apt-get clean && apt-get update && apt-get install -y \ libipe-dev \ libmpfi-dev \ libmpfr-dev \ - libqglviewer-dev-qt5 \ qtbase5-dev \ qtscript5-dev \ qttools5-dev \ @@ -27,6 +26,5 @@ RUN apt-get clean && apt-get update && apt-get install -y \ zlib1g-dev ENV CGAL_TEST_PLATFORM="Debian-Testing" -ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt3:BOOL=OFF\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 4f3b728..cb39831 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -14,7 +14,6 @@ RUN dnf -y install \ gmp-devel.i686 \ ipe.i686 \ ipe-devel.i686 \ - libQGLViewer-devel.i686 \ libstdc++-devel.i686 \ libstdc++-devel.x86_64 \ make \ @@ -23,7 +22,6 @@ RUN dnf -y install \ mpfr-devel.i686 \ ntl-devel.i686 \ qt-devel.i686 \ - qt3-devel.i686 \ qt5-qtbase-devel.i686 \ qt5-qtscript-devel.i686 \ qt5-qtsvg-devel.i686 \ @@ -35,7 +33,7 @@ RUN dnf -y install \ RUN ln -s /usr/lib64/qt5/bin/qhelpgenerator /usr/lib/qt5/bin/qhelpgenerator -ENV CC="gcc -m32" CXX="g++ -m32" QTDIR=/usr/lib/qt-3.3 +ENV CC="gcc -m32" CXX="g++ -m32" ENV CGAL_TEST_PLATFORM="Fedora-32" ENV CGAL_CMAKE_FLAGS="('-DCGAL_HEADER_ONLY:BOOL=TRUE')" ENV INIT_FILE=/tmp/init.cmake diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 640179f..10d8694 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -13,7 +13,6 @@ RUN rpm --import https://src.fedoraproject.org/rpms/fedora-repos/blob/main/f/RPM qt5-qtscript-devel.x86_64 \ qt5-qtsvg-devel.x86_64 \ qt5-qttools-devel.x86_64 \ - libQGLViewer-qt5-devel.x86_64 \ mesa-libGLU-devel \ OpenMesh-devel \ tbb-devel \ diff --git a/Fedora-strict-ansi/Dockerfile b/Fedora-strict-ansi/Dockerfile index c0aaa1e..040f478 100644 --- a/Fedora-strict-ansi/Dockerfile +++ b/Fedora-strict-ansi/Dockerfile @@ -3,6 +3,6 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Fedora-strict-ansi" -ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-Wall -Wextra -ansi\" \"-DWITH_CGAL_Qt3:BOOL=OFF\")" +ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-Wall -Wextra -ansi\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile index a85bc96..8d5f1f5 100644 --- a/Fedora/Dockerfile +++ b/Fedora/Dockerfile @@ -13,7 +13,6 @@ RUN dnf -y install \ ipe-devel.x86_64 \ OpenMesh-devel \ opencv-devel \ - libQGLViewer-qt5-devel.x86_64 \ make \ mpfr-devel.x86_64 \ mpfi-devel.x86_64 \ diff --git a/Ubuntu-CXX11/Dockerfile b/Ubuntu-CXX11/Dockerfile index f3cefcc..28fed04 100644 --- a/Ubuntu-CXX11/Dockerfile +++ b/Ubuntu-CXX11/Dockerfile @@ -3,6 +3,6 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Ubuntu-Latest-CXX11" -ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-std=c++11 -fext-numeric-literals\" \"-DWITH_CGAL_Qt3:BOOL=OFF\")" +ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-std=c++11 -fext-numeric-literals\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu-GCC6-CXX1Z/Dockerfile b/Ubuntu-GCC6-CXX1Z/Dockerfile index 21268d6..a862b05 100644 --- a/Ubuntu-GCC6-CXX1Z/Dockerfile +++ b/Ubuntu-GCC6-CXX1Z/Dockerfile @@ -3,6 +3,6 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Ubuntu-latest-GCC6-CXX1z" -ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++1z\" \"-DWITH_CGAL_Qt3:BOOL=OFF\")" +ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++1z\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu-GCC6-Release/Dockerfile b/Ubuntu-GCC6-Release/Dockerfile index 1975c1f..ff31d94 100644 --- a/Ubuntu-GCC6-Release/Dockerfile +++ b/Ubuntu-GCC6-Release/Dockerfile @@ -3,6 +3,6 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Ubuntu-latest-GCC6-Release" -ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -O3 -DCGAL_NDEBUG\" \"-DWITH_CGAL_Qt3:BOOL=OFF\")" +ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -O3 -DCGAL_NDEBUG\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu-GCC6/Dockerfile b/Ubuntu-GCC6/Dockerfile index f1fd597..173313a 100644 --- a/Ubuntu-GCC6/Dockerfile +++ b/Ubuntu-GCC6/Dockerfile @@ -28,7 +28,7 @@ RUN buildDeps='bison flex libmpc-dev g++ ' \ && apt-get purge -y --auto-remove $buildDeps ENV CGAL_TEST_PLATFORM="Ubuntu-latest-GCC6" -ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wno-expansion-to-defined\" \"-DWITH_CGAL_Qt3:BOOL=OFF\")" +ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wno-expansion-to-defined\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu-GCC_master_cpp20-Release/Dockerfile b/Ubuntu-GCC_master_cpp20-Release/Dockerfile index 1c07063..7ba388c 100644 --- a/Ubuntu-GCC_master_cpp20-Release/Dockerfile +++ b/Ubuntu-GCC_master_cpp20-Release/Dockerfile @@ -3,7 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Ubuntu-GCC_master_CXX20-Release" -ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++2a -O3 -DCGAL_NDEBUG\" \"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-DCMAKE_PREFIX_PATH=/usr/local/boost\")" +ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++2a -O3 -DCGAL_NDEBUG\" \"-DCMAKE_PREFIX_PATH=/usr/local/boost\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu-NO_DEPRECATED_CODE/Dockerfile b/Ubuntu-NO_DEPRECATED_CODE/Dockerfile index 92f5a92..31be704 100644 --- a/Ubuntu-NO_DEPRECATED_CODE/Dockerfile +++ b/Ubuntu-NO_DEPRECATED_CODE/Dockerfile @@ -3,6 +3,6 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url ENV CGAL_TEST_PLATFORM="Ubuntu-Latest-NO_DEPRECATED_CODE" -ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DCGAL_NO_DEPRECATED_CODE\" \"-DWITH_CGAL_Qt3:BOOL=OFF\")" +ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DCGAL_NO_DEPRECATED_CODE\")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index e3f9a7e..f992951 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libboost-all-dev libgmp10-dev \ libmpfr-dev zlib1g-dev \ libeigen3-dev libipe-dev \ - libmpfi-dev libqglviewer-dev-qt5 \ + libmpfi-dev \ libinsighttoolkit4-dev libtbb-dev git RUN git clone https://github.com/STORM-IRIT/OpenGR.git --depth 1 \ diff --git a/test_container/CMakeLists.txt b/test_container/CMakeLists.txt index 74948ce..03e0931 100644 --- a/test_container/CMakeLists.txt +++ b/test_container/CMakeLists.txt @@ -22,10 +22,7 @@ find_package(MPFI QUIET) find_package(OpenGL QUIET) # find_package(OpenMesh QUIET) # message("OpenMesh_FOUND = ${OpenMesh_FOUND}") -find_package(QGLViewer QUIET) # Do not check this. -find_package(Qt3-patched QUIET) -find_package(Qt4 QUIET) find_package(Qt5Core QUIET) find_package(Qt5Help QUIET) find_package(Qt5Script QUIET) @@ -74,12 +71,6 @@ canonic_true_false(MPFI_FOUND) message("MPFI_FOUND = ${MPFI_FOUND}") canonic_true_false(OPENGL_FOUND) message("OPENGL_FOUND = ${OPENGL_FOUND}") -canonic_true_false(QGLVIEWER_FOUND) -message("QGLVIEWER_FOUND = ${QGLVIEWER_FOUND}") -canonic_true_false(QT3_FOUND) -message("QT3_FOUND = ${QT3_FOUND}") -canonic_true_false(Qt4_FOUND) -message("Qt4_FOUND = ${Qt4_FOUND}") canonic_true_false(Qt5Core_FOUND) message("Qt5Core_FOUND = ${Qt5Core_FOUND}") canonic_true_false(Qt5Help_FOUND) From b9ef19f6b056f26aa95df36ab63feb5792ee0d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 27 Jan 2023 17:48:38 +0100 Subject: [PATCH 11/33] manual installation of TBB --- Fedora-rawhide/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 640179f..f0717c1 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -16,14 +16,16 @@ RUN rpm --import https://src.fedoraproject.org/rpms/fedora-repos/blob/main/f/RPM libQGLViewer-qt5-devel.x86_64 \ mesa-libGLU-devel \ OpenMesh-devel \ - tbb-devel \ zlib-devel.x86_64 \ - diffutils \ + diffutils \ + wget \ tar" >> dnf-cmd && \ echo update >> dnf-cmd && \ echo run >> dnf-cmd && \ dnf -y --refresh shell dnf-cmd && rm dnf-cmd && \ - dnf clean all + dnf clean all && \ + wget https://registrationcenter-download.intel.com/akdlm/irc_nas/19143/l_tbb_oneapi_p_2021.8.0.25334_offline.sh && \ + bash l_tbb_oneapi_p_2021.8.0.25334_offline.sh -a --action install --eula accept -s ENV CGAL_TEST_PLATFORM="Fedora-rawhide" ENV CGAL_CMAKE_FLAGS="('-DCGAL_HEADER_ONLY:BOOL=TRUE')" From e46b6ffe5c4c7cc6008e26a15544154e4230ff45 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 27 Jan 2023 18:30:42 +0100 Subject: [PATCH 12/33] cleaning --- Fedora-rawhide/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index f0717c1..58deae6 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -2,8 +2,7 @@ FROM fedora:rawhide ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url -RUN rpm --import https://src.fedoraproject.org/rpms/fedora-repos/blob/main/f/RPM-GPG-KEY-fedora-35-primary && \ - echo "install make cmake gcc-c++ \ +RUN echo "install make cmake gcc-c++ \ gmp-devel.x86_64 mpfr-devel.x86_64 \ boost-devel.x86_64 \ ntl-devel.x86_64 \ @@ -17,7 +16,7 @@ RUN rpm --import https://src.fedoraproject.org/rpms/fedora-repos/blob/main/f/RPM mesa-libGLU-devel \ OpenMesh-devel \ zlib-devel.x86_64 \ - diffutils \ + diffutils \ wget \ tar" >> dnf-cmd && \ echo update >> dnf-cmd && \ @@ -25,7 +24,8 @@ RUN rpm --import https://src.fedoraproject.org/rpms/fedora-repos/blob/main/f/RPM dnf -y --refresh shell dnf-cmd && rm dnf-cmd && \ dnf clean all && \ wget https://registrationcenter-download.intel.com/akdlm/irc_nas/19143/l_tbb_oneapi_p_2021.8.0.25334_offline.sh && \ - bash l_tbb_oneapi_p_2021.8.0.25334_offline.sh -a --action install --eula accept -s + bash l_tbb_oneapi_p_2021.8.0.25334_offline.sh -a --action install --eula accept -s && \ + rm l_tbb_oneapi_p_2021.8.0.25334_offline.sh ENV CGAL_TEST_PLATFORM="Fedora-rawhide" ENV CGAL_CMAKE_FLAGS="('-DCGAL_HEADER_ONLY:BOOL=TRUE')" From 37409b75d731ac72d3a13daefc4234ac09908a1b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 13 Mar 2023 11:45:17 +0100 Subject: [PATCH 13/33] Debug llvm.sh --- Debian-testing-clang-main/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Debian-testing-clang-main/Dockerfile b/Debian-testing-clang-main/Dockerfile index 7782e2b..0ad81a7 100644 --- a/Debian-testing-clang-main/Dockerfile +++ b/Debian-testing-clang-main/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update -y \ && apt-get clean all \ && cd .. && wget https://apt.llvm.org/llvm.sh \ && chmod +x llvm.sh \ -&& ./llvm.sh 16 \ +&& bash -x ./llvm.sh 16 \ && rm ./llvm.sh ENV CXX=/usr/bin/clang++-16 From 85730c24476bd373bcf1c95a10627bc885fee8a5 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 22 Mar 2023 16:19:18 +0100 Subject: [PATCH 14/33] add Boost Chrono --- Ubuntu-GCC_master_cpp20-Release/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ubuntu-GCC_master_cpp20-Release/Dockerfile b/Ubuntu-GCC_master_cpp20-Release/Dockerfile index 1c07063..21aaf18 100644 --- a/Ubuntu-GCC_master_cpp20-Release/Dockerfile +++ b/Ubuntu-GCC_master_cpp20-Release/Dockerfile @@ -9,7 +9,7 @@ COPY init.cmake /tmp/init.cmake RUN git clone -b develop --depth=1 --shallow-submodules --recursive https://github.com/boostorg/boost.git && \ cd boost && git submodule update -q && \ - ./bootstrap.sh --prefix=/usr/local/boost --with-libraries=container,filesystem,system,serialization,iostreams,program_options,thread,date_time && \ + ./bootstrap.sh --prefix=/usr/local/boost --with-libraries=container,filesystem,system,serialization,iostreams,program_options,thread,date_time,chrono && \ ./b2 -d0 install -j4 && \ cd .. && rm -rf boost From 8e20f29867306c04014b990dc5a2d2e7f621a446 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 25 Apr 2023 10:06:02 +0200 Subject: [PATCH 15/33] remove libQGLViewer --- Debian-testing/Dockerfile | 1 - Fedora-32/Dockerfile | 1 - Fedora-rawhide/Dockerfile | 1 - Fedora/Dockerfile | 1 - Ubuntu/Dockerfile | 2 +- 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index cf219b8..7d91dec 100644 --- a/Debian-testing/Dockerfile +++ b/Debian-testing/Dockerfile @@ -15,7 +15,6 @@ RUN apt-get clean && apt-get update && apt-get install -y \ libipe-dev \ libmpfi-dev \ libmpfr-dev \ - libqglviewer-dev-qt5 \ qtbase5-dev \ qtscript5-dev \ qttools5-dev \ diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 4f3b728..7d875b4 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -14,7 +14,6 @@ RUN dnf -y install \ gmp-devel.i686 \ ipe.i686 \ ipe-devel.i686 \ - libQGLViewer-devel.i686 \ libstdc++-devel.i686 \ libstdc++-devel.x86_64 \ make \ diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 58deae6..5403ebe 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -12,7 +12,6 @@ RUN echo "install make cmake gcc-c++ \ qt5-qtscript-devel.x86_64 \ qt5-qtsvg-devel.x86_64 \ qt5-qttools-devel.x86_64 \ - libQGLViewer-qt5-devel.x86_64 \ mesa-libGLU-devel \ OpenMesh-devel \ zlib-devel.x86_64 \ diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile index a85bc96..8d5f1f5 100644 --- a/Fedora/Dockerfile +++ b/Fedora/Dockerfile @@ -13,7 +13,6 @@ RUN dnf -y install \ ipe-devel.x86_64 \ OpenMesh-devel \ opencv-devel \ - libQGLViewer-qt5-devel.x86_64 \ make \ mpfr-devel.x86_64 \ mpfi-devel.x86_64 \ diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index e3f9a7e..f992951 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libboost-all-dev libgmp10-dev \ libmpfr-dev zlib1g-dev \ libeigen3-dev libipe-dev \ - libmpfi-dev libqglviewer-dev-qt5 \ + libmpfi-dev \ libinsighttoolkit4-dev libtbb-dev git RUN git clone https://github.com/STORM-IRIT/OpenGR.git --depth 1 \ From 2469bdf90a6981106b6f17c793ffc2d3b3c217be Mon Sep 17 00:00:00 2001 From: Nicolas Saillant Date: Tue, 25 Apr 2023 16:01:27 +0200 Subject: [PATCH 16/33] Use CTEST in run-testsuite.sh --- run-testsuite.sh | 101 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 73 insertions(+), 28 deletions(-) diff --git a/run-testsuite.sh b/run-testsuite.sh index ef60b8f..99b554f 100755 --- a/run-testsuite.sh +++ b/run-testsuite.sh @@ -31,24 +31,20 @@ CGAL_DATA_DIR="${CGAL_RELEASE_DIR}data/" # The directory where testresults are stored. CGAL_TESTRESULTS="/mnt/testresults/" -# The actual logfile. -CGAL_LOG_FILE="${CGAL_TESTRESULTS}${CGAL_TEST_PLATFORM}" - -# The directory of the build tree. The layout is so convoluted so -# satisfy collect_cgal_testresults_from_cmake. -# -# It assumes the build directory containing CMakeCache.txt, -# include/CGAL/compiler_config.h, etc. to be the parent directory. + CGAL_DIR="$HOME/build/src/cmake/platforms/${CGAL_TEST_PLATFORM}/" +# The directory where the release is built. CGAL_SRC_BUILD_DIR="${CGAL_DIR}" +# The directory where the tests are built. CGAL_TEST_BUILD_DIR="$HOME/build/src/cmake/platforms/${CGAL_TEST_PLATFORM}/test/" +PLATFORM="$CGAL_TEST_PLATFORM" export CGAL_DIR export CGAL_TEST_PLATFORM export CGAL_DATA_DIR # Create the binary directories -if [ ! -d "${CGAL_SRC_BUILD_DIR}" ]; then +if [ ! -d "${CGAL_SRC_BUILD_DIR}" ]; then mkdir -p "${CGAL_SRC_BUILD_DIR}" fi if [ ! -d "${CGAL_TEST_BUILD_DIR}" ]; then @@ -57,31 +53,80 @@ fi # Build CGAL. The CGAL_CMAKE_FLAGS used here will affect all other # builds using this binary directory. + cd "${CGAL_SRC_BUILD_DIR}" if [ -n "$DOCKERFILE_URL" ]; then - echo "Docker image built from ${DOCKERFILE_URL}" | tee "installation.log" + echo "Docker image built from ${DOCKERFILE_URL}" | tee "${CGAL_TESTRESULTS}installation.log" +else + echo "Docker container" > ${CGAL_TESTRESULTS}installation.log +fi + +cmake ${INIT_FILE:+"-C${INIT_FILE}"} -DBUILD_TESTING=ON -DWITH_tests=ON -DCGAL_TEST_SUITE=ON $CGAL_RELEASE_DIR >${CGAL_TESTRESULTS}installation.log 2>&1 +rm CMakeCache.txt +CMAKE_OPTS="-DCGAL_TEST_SUITE=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DWITH_tests=ON" +if [ -z "${SHOW_PROGRESS}" ]; then + cmake ${INIT_FILE:+"-C${INIT_FILE}"} -DBUILD_TESTING=ON ${CMAKE_OPTS} $CGAL_RELEASE_DIR >${CGAL_TESTRESULTS}package_installation.log 2>&1 else - echo "Docker container" > installation.log + cmake ${INIT_FILE:+"-C${INIT_FILE}"} -DBUILD_TESTING=ON ${CMAKE_OPTS} $CGAL_RELEASE_DIR 2>&1 |tee ${CGAL_TESTRESULTS}package_installation.log fi -cmake ${INIT_FILE:+"-C${INIT_FILE}"} -DRUNNING_CGAL_AUTO_TEST=TRUE \ - "${CGAL_CMAKE_FLAGS[@]}" "${CGAL_RELEASE_DIR}" 2>&1 | tee -a "installation.log" -make VERBOSE=ON -k -fMakefile 2>&1 | tee -a "installation.log" -# Build and Execute the Tests +LIST_TEST_FILE="${CGAL_TESTRESULTS}list_test_packages" +if [ -f ${LIST_TEST_FILE} ]; then + LIST_TEST_PACKAGES=$(source ${LIST_TEST_FILE}) +fi +INIT="" +for pkg in $LIST_TEST_PACKAGES; do + if [ -z "$INIT" ]; then + TO_TEST=$pkg + INIT="y" + else + TO_TEST="${TO_TEST}|$pkg" + fi +done +#unsets the limit of 1024 bits for the logs through ssh +echo "SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1000000000)" > CTestCustom.cmake +echo "SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 1000000000)" >> CTestCustom.cmake +CTEST_OPTS="-T Start -T Test --timeout 1200 ${DO_NOT_TEST:+-E execution___of__}" +if [ -z "${SHOW_PROGRESS}" ]; then + ctest ${TO_TEST:+-L ${TO_TEST} } ${CTEST_OPTS} -j${NUMBER_OF_PROCESSORS} ${KEEP_TESTS:+-FC .}>tmp.txt +else + ctest ${TO_TEST:+-L ${TO_TEST} } ${CTEST_OPTS} -j${NUMBER_OF_PROCESSORS} ${KEEP_TESTS:+-FC .}|tee tmp.txt +fi -# We need to make a copy of the whole test dir because the current -# scripts don't allow out of source builds. -cp -r "${CGAL_TEST_DIR}/." "${CGAL_TEST_BUILD_DIR}" -cd "${CGAL_TEST_BUILD_DIR}" -make -j ${CGAL_NUMBER_OF_JOBS} -k -fmakefile2 +TAG_DIR=$(awk '/^Create new tag: /{print $4F}' tmp.txt) +rm tmp.txt +cd Testing/${TAG_DIR} +RESULT_FILE=./"results_${CGAL_TESTER}_${PLATFORM}.txt" +rm -f "$RESULT_FILE" +touch "$RESULT_FILE" -# Copy version.h, so that collect_cgal_testresults_from_cmake can find it. -mkdir -p "$HOME/build/src/include/CGAL" -cp "${CGAL_RELEASE_DIR}/include/CGAL/version.h" "$HOME/build/src/include/CGAL" -cp "${CGAL_RELEASE_DIR}"/.scm* "$HOME/build/src/" +sed -n '/The CXX compiler/s/-- The CXX compiler identification is/COMPILER_VERSION =/p' < "${CGAL_TESTRESULTS}installation.log" |sed -E "s/ = (.*)/\ = '\1\'/">> "$RESULT_FILE" +sed -n '/CGAL_VERSION /s/#define //p' < "${CGAL_RELEASE_DIR}include/CGAL/version.h" >> "$RESULT_FILE" +echo "TESTER ${CGAL_TESTER}" >> "$RESULT_FILE" +echo "TESTER_NAME ${CGAL_TESTER}" >> "$RESULT_FILE" +echo "TESTER_ADDRESS ${TESTER_ADDRESS}" >> "$RESULT_FILE" +echo "CGAL_TEST_PLATFORM ${PLATFORM}" >> "$RESULT_FILE" +grep -e "^-- USING " "${CGAL_TESTRESULTS}installation.log"|sort -u >> $RESULT_FILE +#Use sed to get the content of DEBUG or RELEASE CXX FLAGS so that Multiconfiguration platforms do provide their CXXXFLAGS to the testsuite page (that greps USING CXXFLAGS to get info) +sed -i -E 's/(^-- USING )(DEBUG|RELEASE) (CXXFLAGS)/\1\3/' $RESULT_FILE +echo "------------" >> "$RESULT_FILE" +touch ../../../../../.scm-branch +python3 ${CGAL_RELEASE_DIR}test/parse-ctest-dashboard-xml.py $CGAL_TESTER $PLATFORM -./collect_cgal_testresults_from_cmake +for file in $(ls|grep _Tests); do + mv $file "$(echo "$file" | sed 's/_Tests//g')" +done +OUTPUT_FILE=results_${CGAL_TESTER}_${PLATFORM}.tar +TEST_REPORT="TestReport_${CGAL_TESTER}_${PLATFORM}" +mkdir -p Installation +chmod 777 Installation +cat "${CGAL_TESTRESULTS}package_installation.log" >> "Installation/${TEST_REPORT}" -# Those are the files generated by collect_cgal_testresults_from_cmake. -cp "results_${CGAL_TESTER}_${CGAL_TEST_PLATFORM}.tar.gz" "results_${CGAL_TESTER}_${CGAL_TEST_PLATFORM}.txt" \ - "${CGAL_TESTRESULTS}/" +#call the python script to complete the results report. +python3 ${CGAL_RELEASE_DIR}test/post_process_ctest_results.py Installation/${TEST_REPORT} ${TEST_REPORT} results_${CGAL_TESTER}_${PLATFORM}.txt +rm -f $OUTPUT_FILE $OUTPUT_FILE.gz +rm ../../../../../.scm-branch +tar cf $OUTPUT_FILE results_${CGAL_TESTER}_${PLATFORM}.txt */"$TEST_REPORT" +echo +gzip -9f $OUTPUT_FILE +cp "${OUTPUT_FILE}.gz" "results_${CGAL_TESTER}_${PLATFORM}.txt" "${CGAL_TESTRESULTS}" From a5cff78ac8884d1d5da17549a38f09dfbd3b7658 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 9 May 2023 11:46:51 +0200 Subject: [PATCH 17/33] Recent Fedora no longer install /usr/bin/su by default --- Fedora-32/Dockerfile | 1 + Fedora-rawhide/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 7d875b4..8d9a0c3 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -4,6 +4,7 @@ ENV DOCKERFILE_URL=$dockerfile_url RUN dnf -y update; dnf clean all RUN dnf -y install \ + util-linux \ boost-devel.i686 \ cmake \ eigen3-devel.noarch \ diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 5403ebe..f8f77c6 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -3,6 +3,7 @@ ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url RUN echo "install make cmake gcc-c++ \ + util-linux \ gmp-devel.x86_64 mpfr-devel.x86_64 \ boost-devel.x86_64 \ ntl-devel.x86_64 \ From 0e213e192e3745ca6929ba5730d162eae418c6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 10 May 2023 16:38:32 +0200 Subject: [PATCH 18/33] add -Wno-dangling-reference --- ArchLinux-CXX17-Release/init.cmake | 2 +- ArchLinux/init.cmake | 2 +- Fedora-32/init.cmake | 2 +- Fedora-Release/init.cmake | 2 +- Fedora-rawhide-Release/init.cmake | 2 +- Fedora-rawhide/init.cmake | 2 +- Fedora-with-LEDA/init.cmake | 2 +- Fedora/init.cmake | 2 +- Ubuntu-GCC6-CXX1Z/init.cmake | 2 +- Ubuntu-GCC6/init.cmake | 2 +- Ubuntu-GCC_master_cpp20-Release/init.cmake | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ArchLinux-CXX17-Release/init.cmake b/ArchLinux-CXX17-Release/init.cmake index 61570ae..653ae1c 100644 --- 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/init.cmake b/ArchLinux/init.cmake index 149ed65..5cd5a93 100644 --- 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/Fedora-32/init.cmake b/Fedora-32/init.cmake index 149ed65..5cd5a93 100644 --- a/Fedora-32/init.cmake +++ b/Fedora-32/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/Fedora-Release/init.cmake b/Fedora-Release/init.cmake index b2bba65..c88abc7 100644 --- a/Fedora-Release/init.cmake +++ b/Fedora-Release/init.cmake @@ -1,4 +1,4 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -msse3 -fsanitize=address" CACHE STRING "") +SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference -msse3 -fsanitize=address" CACHE STRING "") SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") SET(CMAKE_CXX_FLAGS_RELEASE "-DCGAL_NDEBUG -O3" CACHE STRING "") SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "") diff --git a/Fedora-rawhide-Release/init.cmake b/Fedora-rawhide-Release/init.cmake index 4fefad8..94250ff 100644 --- a/Fedora-rawhide-Release/init.cmake +++ b/Fedora-rawhide-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 "-DCGAL_NDEBUG -O3" CACHE STRING "") SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "") diff --git a/Fedora-rawhide/init.cmake b/Fedora-rawhide/init.cmake index 149ed65..5cd5a93 100644 --- a/Fedora-rawhide/init.cmake +++ b/Fedora-rawhide/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/Fedora-with-LEDA/init.cmake b/Fedora-with-LEDA/init.cmake index 84b3263..b6af942 100644 --- a/Fedora-with-LEDA/init.cmake +++ b/Fedora-with-LEDA/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 "-DCGAL_NDEBUG -O3" CACHE STRING "") SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "") diff --git a/Fedora/init.cmake b/Fedora/init.cmake index 149ed65..5cd5a93 100644 --- a/Fedora/init.cmake +++ b/Fedora/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/Ubuntu-GCC6-CXX1Z/init.cmake b/Ubuntu-GCC6-CXX1Z/init.cmake index 3419983..4c6da88 100644 --- a/Ubuntu-GCC6-CXX1Z/init.cmake +++ b/Ubuntu-GCC6-CXX1Z/init.cmake @@ -1,4 +1,4 @@ -SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++1z -frounding-math" CACHE STRING "") +SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -Wno-dangling-reference -std=c++1z -frounding-math" 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/Ubuntu-GCC6/init.cmake b/Ubuntu-GCC6/init.cmake index ec9593a..cb939d3 100644 --- a/Ubuntu-GCC6/init.cmake +++ b/Ubuntu-GCC6/init.cmake @@ -1,4 +1,4 @@ -SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wno-expansion-to-defined -frounding-math" CACHE STRING "") +SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wno-dangling-reference -Wno-expansion-to-defined -frounding-math" 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/Ubuntu-GCC_master_cpp20-Release/init.cmake b/Ubuntu-GCC_master_cpp20-Release/init.cmake index c4ed734..8750381 100644 --- a/Ubuntu-GCC_master_cpp20-Release/init.cmake +++ b/Ubuntu-GCC_master_cpp20-Release/init.cmake @@ -1,4 +1,4 @@ -SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -frounding-math -std=c++2a" CACHE STRING "") +SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -Wno-dangling-reference -frounding-math -std=c++2a" CACHE STRING "") SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") SET(CMAKE_CXX_FLAGS_RELEASE "-DCGAL_NDEBUG -O3" CACHE STRING "") SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "") From 777a95c0af54265c4695a8c86b5185d578840927 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Mon, 22 May 2023 15:39:13 +0200 Subject: [PATCH 19/33] added scip (incl. soplex) and ceres-solver libs --- Ubuntu/Dockerfile | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index f992951..32d3a5e 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential cmake \ libopencv-dev \ libsuitesparse-dev \ - tar \ + tar libgoogle-glog-dev \ libboost-all-dev libgmp10-dev \ libmpfr-dev zlib1g-dev \ libeigen3-dev libipe-dev \ @@ -50,7 +50,37 @@ RUN git clone --recursive https://github.com/oxfordcontrol/osqp \ && make install \ && cd ../.. \ && rm -rf osqp - + +RUN git clone https://github.com/scipopt/soplex \ + && cd soplex \ + && mkdir build \ + && cd build \ + && cmake .. \ + && make -j"$(nproc)" \ + && make install \ + && cd .. \ + && rm -rf soplex + +RUN git clone https://github.com/scipopt/scip \ + && cd scip \ + && mkdir build \ + && cd build \ + && cmake -DAUTOBUILD=ON .. \ + && make -j"$(nproc)" \ + && make install \ + && cd .. \ + && rm -rf scip + +RUN git clone https://ceres-solver.googlesource.com/ceres-solver \ + && cd ceres-solver \ + && mkdir build \ + && cd build \ + && cmake .. \ + && make -j"$(nproc)" \ + && make install \ + && cd .. \ + && rm -rf ceres-solver + ENV CGAL_TEST_PLATFORM="Ubuntu-Latest" ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt5:BOOL=OFF\")" ENV INIT_FILE=/tmp/init.cmake From 6a06d9abb7c955dad479c1968174542ae9d7be0d Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Wed, 24 May 2023 17:46:14 +0200 Subject: [PATCH 20/33] removing glog --- Ubuntu/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index 32d3a5e..e030e26 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential cmake \ libopencv-dev \ libsuitesparse-dev \ - tar libgoogle-glog-dev \ + tar \ libboost-all-dev libgmp10-dev \ libmpfr-dev zlib1g-dev \ libeigen3-dev libipe-dev \ @@ -75,7 +75,7 @@ RUN git clone https://ceres-solver.googlesource.com/ceres-solver \ && cd ceres-solver \ && mkdir build \ && cd build \ - && cmake .. \ + && cmake -DMINIGLOG=ON .. \ && make -j"$(nproc)" \ && make install \ && cd .. \ From ed15860123b277aff8a6f9d73b5d7bd82ef36944 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Tue, 30 May 2023 14:30:32 +0200 Subject: [PATCH 21/33] set MINIGLOG_MAX_LOG_LEVEL to 0 to suppress log spamming --- Ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index e030e26..ae2254a 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -75,7 +75,7 @@ RUN git clone https://ceres-solver.googlesource.com/ceres-solver \ && cd ceres-solver \ && mkdir build \ && cd build \ - && cmake -DMINIGLOG=ON .. \ + && cmake -DMINIGLOG=ON -DMINIGLOG_MAX_LOG_LEVEL=0 .. \ && make -j"$(nproc)" \ && make install \ && cd .. \ From fe16b84a6804326460ea7cdf0992858d2889a401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 2 Jun 2023 17:44:19 +0200 Subject: [PATCH 22/33] work around merge of https://github.com/ethz-asl/libpointmatcher/pull/506 --- Ubuntu/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index ae2254a..17a1b39 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -37,10 +37,10 @@ RUN git clone https://github.com/ethz-asl/libpointmatcher.git \ && SRC_DIR=`pwd` \ && BUILD_DIR=${SRC_DIR}/build \ && mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} \ - && cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release ${SRC_DIR} \ + && cmake -DBUILD_SHARED_LIBS=ON -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=Release ${SRC_DIR} \ && make -j"$(nproc)" && make install \ && cd ../.. && rm -rf libpointmatcher - + RUN git clone --recursive https://github.com/oxfordcontrol/osqp \ && cd ./osqp \ && mkdir build \ @@ -50,7 +50,7 @@ RUN git clone --recursive https://github.com/oxfordcontrol/osqp \ && make install \ && cd ../.. \ && rm -rf osqp - + RUN git clone https://github.com/scipopt/soplex \ && cd soplex \ && mkdir build \ @@ -60,7 +60,7 @@ RUN git clone https://github.com/scipopt/soplex \ && make install \ && cd .. \ && rm -rf soplex - + RUN git clone https://github.com/scipopt/scip \ && cd scip \ && mkdir build \ @@ -70,7 +70,7 @@ RUN git clone https://github.com/scipopt/scip \ && make install \ && cd .. \ && rm -rf scip - + RUN git clone https://ceres-solver.googlesource.com/ceres-solver \ && cd ceres-solver \ && mkdir build \ @@ -80,7 +80,7 @@ RUN git clone https://ceres-solver.googlesource.com/ceres-solver \ && make install \ && cd .. \ && rm -rf ceres-solver - + ENV CGAL_TEST_PLATFORM="Ubuntu-Latest" ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt5:BOOL=OFF\")" ENV INIT_FILE=/tmp/init.cmake From 38488abeb432484eb2e93d46a49f799204ced1a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 2 Jun 2023 18:20:17 +0200 Subject: [PATCH 23/33] directly patch the cmake script --- Ubuntu/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index 17a1b39..b045057 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -34,10 +34,11 @@ RUN git clone https://github.com/ethz-asl/libnabo.git \ RUN git clone https://github.com/ethz-asl/libpointmatcher.git \ && cd libpointmatcher \ + && sed -i 's/Boost_USE_STATIC_LIBS ON/Boost_USE_STATIC_LIBS OFF/' CMakeLists.txt && SRC_DIR=`pwd` \ && BUILD_DIR=${SRC_DIR}/build \ && mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} \ - && cmake -DBUILD_SHARED_LIBS=ON -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=Release ${SRC_DIR} \ + && cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release ${SRC_DIR} \ && make -j"$(nproc)" && make install \ && cd ../.. && rm -rf libpointmatcher From d320888491b9b083974e9c0200ba9c2584df3bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 2 Jun 2023 18:29:50 +0200 Subject: [PATCH 24/33] missing continue --- Ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index b045057..6b44c12 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -34,7 +34,7 @@ RUN git clone https://github.com/ethz-asl/libnabo.git \ RUN git clone https://github.com/ethz-asl/libpointmatcher.git \ && cd libpointmatcher \ - && sed -i 's/Boost_USE_STATIC_LIBS ON/Boost_USE_STATIC_LIBS OFF/' CMakeLists.txt + && sed -i 's/Boost_USE_STATIC_LIBS ON/Boost_USE_STATIC_LIBS OFF/' CMakeLists.txt \ && SRC_DIR=`pwd` \ && BUILD_DIR=${SRC_DIR}/build \ && mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} \ From 4ae352e8f515aec10103ab17ac4b1df3759d433b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 5 Jun 2023 15:39:53 +0200 Subject: [PATCH 25/33] do not use OPEN_MP + no example build --- Ubuntu/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index 6b44c12..e8c152f 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -28,7 +28,7 @@ RUN git clone https://github.com/ethz-asl/libnabo.git \ && cd libnabo \ && SRC_DIR=`pwd` && BUILD_DIR=${SRC_DIR}/build \ && mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} \ - && cmake -DCMAKE_BUILD_TYPE=Release ${SRC_DIR} \ + && cmake -DCMAKE_BUILD_TYPE=Release -DUSE_OPEN_MP=False ${SRC_DIR} \ && make && make install \ && cd ../.. && rm -rf libnado @@ -38,7 +38,7 @@ RUN git clone https://github.com/ethz-asl/libpointmatcher.git \ && SRC_DIR=`pwd` \ && BUILD_DIR=${SRC_DIR}/build \ && mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} \ - && cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release ${SRC_DIR} \ + && cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DPOINTMATCHER_BUILD_EXAMPLES=OFF -DPOINTMATCHER_BUILD_EVALUATIONS=OFF ${SRC_DIR} \ && make -j"$(nproc)" && make install \ && cd ../.. && rm -rf libpointmatcher From 77736c39d53a9fc852138808bad0c6a12804828b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 5 Jun 2023 16:23:05 +0200 Subject: [PATCH 26/33] Update Debian master-clang --- Debian-testing-clang-main/Dockerfile | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Debian-testing-clang-main/Dockerfile b/Debian-testing-clang-main/Dockerfile index 0ad81a7..4913844 100644 --- a/Debian-testing-clang-main/Dockerfile +++ b/Debian-testing-clang-main/Dockerfile @@ -1,17 +1,14 @@ -FROM cgal/testsuite-docker:debian-testing +FROM debian:testing ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url +ENV DOCKERFILE_URL=$dockerfile_url -RUN apt-get update -y \ -&& apt-get install wget \ -&& apt-get install -y software-properties-common \ -&& apt-get clean all \ -&& cd .. && wget https://apt.llvm.org/llvm.sh \ -&& chmod +x llvm.sh \ -&& bash -x ./llvm.sh 16 \ -&& rm ./llvm.sh +RUN apt-get update -y && apt-get install -y wget \ +&& wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \ +&& echo 'deb http://apt.llvm.org/unstable/ llvm-toolchain main' > /etc/apt/sources.list.d/llvm.list \ +&& apt-get update -y \ +&& apt-get install -y clang \ +&& apt-get clean all -ENV CXX=/usr/bin/clang++-16 -ENV CC=/usr/bin/clang-16 +ENV CXX=/usr/bin/clang++ +ENV CC=/usr/bin/clang ENV CGAL_TEST_PLATFORM="Debian-testing-clang-main" - From 23fe5a8ef203c6a16ab1f3cf17cb9a8d2e0faf80 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Sun, 11 Jun 2023 18:57:27 +0200 Subject: [PATCH 27/33] libglew is useless --- Debian-stable/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Debian-stable/Dockerfile b/Debian-stable/Dockerfile index c8b5fb2..c73f656 100644 --- a/Debian-stable/Dockerfile +++ b/Debian-stable/Dockerfile @@ -10,7 +10,6 @@ RUN apt-get update && apt-get install -y \ libboost-program-options-dev \ libboost-thread-dev \ libeigen3-dev \ - libglew1.5-dev \ libgmp10-dev \ libipe-dev \ libmpfi-dev \ From 6a74b510f77edbf5ab048c26fab78bbb5e4686b8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 14 Jun 2023 09:05:03 +0200 Subject: [PATCH 28/33] use boost-master and eigen-master with all gcc-master on Ubuntu --- CentOS-5/Dockerfile | 40 ------------------ CentOS-5/init.cmake | 4 -- CentOS-6-32/Dockerfile | 48 ---------------------- CentOS-6-32/init.cmake | 4 -- CentOS-6-CXX11-Boost157/Dockerfile | 18 -------- CentOS-6-CXX11-Boost157/init.cmake | 4 -- CentOS-6/Dockerfile | 37 ----------------- CentOS-6/init.cmake | 4 -- Ubuntu-GCC6-CXX1Z/init.cmake | 2 + Ubuntu-GCC6-Release/init.cmake | 2 + Ubuntu-GCC6/Dockerfile | 11 +++++ Ubuntu-GCC6/init.cmake | 2 + Ubuntu-GCC_master_cpp20-Release/Dockerfile | 11 ----- 13 files changed, 17 insertions(+), 170 deletions(-) delete mode 100644 CentOS-5/Dockerfile delete mode 100644 CentOS-5/init.cmake delete mode 100644 CentOS-6-32/Dockerfile delete mode 100644 CentOS-6-32/init.cmake delete mode 100644 CentOS-6-CXX11-Boost157/Dockerfile delete mode 100644 CentOS-6-CXX11-Boost157/init.cmake delete mode 100644 CentOS-6/Dockerfile delete mode 100644 CentOS-6/init.cmake diff --git a/CentOS-5/Dockerfile b/CentOS-5/Dockerfile deleted file mode 100644 index 6cca9ea..0000000 --- a/CentOS-5/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM centos:centos5 -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -RUN yum -y update; yum clean all -RUN yum -y install \ - curl \ - gcc-c++ \ - glibc-devel.x86_64 \ - gmp-devel.x86_64 \ - libstdc++-devel.x86_64 \ - make \ - tar \ - zlib-devel.x86_64; yum clean all - -RUN curl -s -SL http://bitbucket.org/eigen/eigen/get/3.2.8.tar.gz | tar xz && \ - mkdir -p /usr/local/include/eigen3 && \ - cd eigen-* && \ - cp -R Eigen/ /usr/local/include/eigen3 && \ - cp -R unsupported /usr/local/include/eigen3 && \ - cp -R signature_of_eigen3_matrix_library /usr/local/include/eigen3 && \ - cd .. && \ - rm -rf eigen* - -ENV BOOST_MAJOR=1 BOOST_MINOR=48 BOOST_PATCH=0 -RUN curl -s -SL http://sourceforge.net/projects/boost/files/boost/${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH}/boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}.tar.gz | tar xz && \ - cd boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH} && \ - ./bootstrap.sh --without-libraries=filesystem,graph_parallel,python,iostreams,locale,mpi,serialization,signals,wave && \ - ./b2 -d0 --prefix=/usr/local/ install && \ - cd .. && \ - rm -rf boost_* - -RUN curl -s -k -SL "https://cmake.org/files/v3.1/cmake-3.1.3-Linux-x86_64.sh" -o cmake.sh && bash cmake.sh --skip-license && rm cmake.sh - -ENV CGAL_TEST_PLATFORM="CentOS5" -ENV CGAL_CMAKE_FLAGS="()" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake - -LABEL org.cgal.releases_to_ignore="^[5-9]" diff --git a/CentOS-5/init.cmake b/CentOS-5/init.cmake deleted file mode 100644 index 22a0529..0000000 --- a/CentOS-5/init.cmake +++ /dev/null @@ -1,4 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" 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-6-32/Dockerfile b/CentOS-6-32/Dockerfile deleted file mode 100644 index 1c6a2e6..0000000 --- a/CentOS-6-32/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -FROM centos:centos6 -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -RUN yum -y install epel-release.noarch; yum -y update; yum clean all -RUN yum -y update; yum -y install \ - eigen3-devel.noarch \ - gcc-c++ \ - glew-devel.i686 \ - glibc-devel.i686 \ - glibc-devel.x86_64 \ - gmp-devel.i686 \ - libstdc++-devel.i686 \ - libstdc++-devel.x86_64 \ - make \ - mpfr-devel.i686 \ - ntl-devel.i686 \ - mesa-libGL-devel.i686 \ - mesa-libGLU-devel.i686 \ - qt5-qtbase-devel.i686 \ - qt5-qtscript-devel.i686 \ - qt5-qtsvg-devel.i686 \ - qt5-qttools-devel.i686 \ - tar \ - zlib-devel.i686 && yum clean all - -RUN curl -fSL "https://cmake.org/files/v3.1/cmake-3.1.3-Linux-i386.sh" -o cmake.sh && bash cmake.sh --skip-license && rm cmake.sh - -ENV BOOST_MAJOR=1 BOOST_MINOR=48 BOOST_PATCH=0 -RUN curl -s -SL http://sourceforge.net/projects/boost/files/boost/${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH}/boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}.tar.gz | tar xz && \ - cd boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH} && \ - ./bootstrap.sh --without-libraries=graph_parallel,python,iostreams,locale,mpi,serialization,signals,wave && \ - ./b2 -d0 \ - cflags=-m32 \ - cxxflags=-m32 \ - address-model=32 \ - threading=multi \ - architecture=x86 \ - instruction-set=i686 \ - --prefix=/usr/local/ install && \ - cd .. && rm -rf boost_* - -ENV CC="gcc -m32" CXX="g++ -m32" -ENV CGAL_TEST_PLATFORM="CentOS6-32" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake - -LABEL org.cgal.releases_to_ignore="^[5-9]" diff --git a/CentOS-6-32/init.cmake b/CentOS-6-32/init.cmake deleted file mode 100644 index 22a0529..0000000 --- a/CentOS-6-32/init.cmake +++ /dev/null @@ -1,4 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" 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-6-CXX11-Boost157/Dockerfile b/CentOS-6-CXX11-Boost157/Dockerfile deleted file mode 100644 index bb08f62..0000000 --- a/CentOS-6-CXX11-Boost157/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM cgal/testsuite-docker:centos6 -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -# cgal/testsuite-docker:centos6 has a boost installation, remove it -RUN rm -rf /usr/local/include/boost -RUN rm -f /usr/local/lib/libboost_* - -ENV BOOST_MAJOR=1 BOOST_MINOR=57 BOOST_PATCH=0 -RUN curl -s -SL http://sourceforge.net/projects/boost/files/boost/${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH}/boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}.tar.gz | tar xz -RUN cd boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH} && \ - ./bootstrap.sh --without-libraries=filesystem,graph_parallel,python,iostreams,locale,mpi,serialization,signals,wave && \ - ./b2 cxxflags="-std=c++0x" linkflags="-std=c++0x" --prefix=/usr/local/ install - -ENV CGAL_TEST_PLATFORM="CentOS6-CXX11-Boost157" -ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-Wall -std=c++0x\")" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake diff --git a/CentOS-6-CXX11-Boost157/init.cmake b/CentOS-6-CXX11-Boost157/init.cmake deleted file mode 100644 index 39e4b64..0000000 --- a/CentOS-6-CXX11-Boost157/init.cmake +++ /dev/null @@ -1,4 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -std=c++11" 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-6/Dockerfile b/CentOS-6/Dockerfile deleted file mode 100644 index 66d8380..0000000 --- a/CentOS-6/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM centos:centos6 -ARG dockerfile_url -ENV DOCKERFILE_URL=$dockerfile_url - -RUN yum -y install epel-release.noarch; yum -y update; yum clean all -RUN yum -y install \ - curl \ - eigen3-devel.noarch \ - gcc-c++ \ - glew-devel.x86_64 \ - glibc-devel.x86_64 \ - gmp-devel.x86_64 \ - libstdc++-devel.x86_64 \ - make \ - mpfr-devel.x86_64 \ - ntl-devel.x86_64 \ - qt5-qtbase-devel.x86_64 \ - qt5-qtscript-devel.x86_64 \ - qt5-qtsvg-devel.x86_64 \ - qt5-qttools-devel.x86_64 \ - tar \ - zlib-devel.x86_64 && yum clean all - -RUN curl -fSL "https://cmake.org/files/v3.1/cmake-3.1.3-Linux-x86_64.sh" -o cmake.sh && bash cmake.sh --skip-license && rm cmake.sh - -ENV BOOST_MAJOR=1 BOOST_MINOR=55 BOOST_PATCH=0 -RUN curl -s -SL http://sourceforge.net/projects/boost/files/boost/${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH}/boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}.tar.gz | tar xz && \ - cd boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH} && \ - ./bootstrap.sh --without-libraries=graph_parallel,python,iostreams,locale,mpi,serialization,signals,wave && \ - ./b2 -d0 --prefix=/usr/local/ install && \ - cd .. && rm -rf boost_* - -ENV CGAL_TEST_PLATFORM="CentOS6" -ENV INIT_FILE=/tmp/init.cmake -COPY init.cmake /tmp/init.cmake - -LABEL org.cgal.releases_to_ignore="^[5-9]" diff --git a/CentOS-6/init.cmake b/CentOS-6/init.cmake deleted file mode 100644 index 22a0529..0000000 --- a/CentOS-6/init.cmake +++ /dev/null @@ -1,4 +0,0 @@ -SET(CMAKE_CXX_FLAGS "-Wall -frounding-math" 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/Ubuntu-GCC6-CXX1Z/init.cmake b/Ubuntu-GCC6-CXX1Z/init.cmake index 4c6da88..9552257 100644 --- a/Ubuntu-GCC6-CXX1Z/init.cmake +++ b/Ubuntu-GCC6-CXX1Z/init.cmake @@ -3,3 +3,5 @@ SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "") SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "") SET(WITH_CGAL_Qt5 OFF CACHE BOOL "") +SET(CMAKE_PREFIX_PATH "/usr/local/boost" CACHE STRING "") +SET(EIGEN3_INCLUDE_DIR "/usr/local/include/eigen3" CACHE STRING "") diff --git a/Ubuntu-GCC6-Release/init.cmake b/Ubuntu-GCC6-Release/init.cmake index 47b67a3..359249c 100644 --- a/Ubuntu-GCC6-Release/init.cmake +++ b/Ubuntu-GCC6-Release/init.cmake @@ -3,3 +3,5 @@ SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") SET(CMAKE_CXX_FLAGS_RELEASE "-DCGAL_NDEBUG -O3" CACHE STRING "") SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "") SET(WITH_CGAL_Qt5 OFF CACHE BOOL "") +SET(CMAKE_PREFIX_PATH "/usr/local/boost" CACHE STRING "") +SET(EIGEN3_INCLUDE_DIR "/usr/local/include/eigen3" CACHE STRING "") diff --git a/Ubuntu-GCC6/Dockerfile b/Ubuntu-GCC6/Dockerfile index 173313a..7528c73 100644 --- a/Ubuntu-GCC6/Dockerfile +++ b/Ubuntu-GCC6/Dockerfile @@ -27,6 +27,17 @@ RUN buildDeps='bison flex libmpc-dev g++ ' \ && ldconfig \ && apt-get purge -y --auto-remove $buildDeps +RUN git clone -b develop --depth=1 --shallow-submodules --recursive https://github.com/boostorg/boost.git && \ + cd boost && git submodule update -q && \ + ./bootstrap.sh --prefix=/usr/local/boost --with-libraries=container,filesystem,system,serialization,iostreams,program_options,thread,date_time,chrono && \ + ./b2 -d0 install -j4 && \ + cd .. && rm -rf boost + +RUN git clone --depth=1 --shallow-submodules https://gitlab.com/libeigen/eigen.git && \ + cd eigen && git submodule update --quiet --init --recursive && \ + mkdir build && cd build && \ + cmake .. && make install && cd .. && rm -rf eigen + ENV CGAL_TEST_PLATFORM="Ubuntu-latest-GCC6" ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wno-expansion-to-defined\")" diff --git a/Ubuntu-GCC6/init.cmake b/Ubuntu-GCC6/init.cmake index cb939d3..eff7bb7 100644 --- a/Ubuntu-GCC6/init.cmake +++ b/Ubuntu-GCC6/init.cmake @@ -3,3 +3,5 @@ SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "") SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "") SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "") SET(WITH_CGAL_Qt5 OFF CACHE BOOL "") +SET(CMAKE_PREFIX_PATH "/usr/local/boost" CACHE STRING "") +SET(EIGEN3_INCLUDE_DIR "/usr/local/include/eigen3" CACHE STRING "") diff --git a/Ubuntu-GCC_master_cpp20-Release/Dockerfile b/Ubuntu-GCC_master_cpp20-Release/Dockerfile index 537411c..d98e328 100644 --- a/Ubuntu-GCC_master_cpp20-Release/Dockerfile +++ b/Ubuntu-GCC_master_cpp20-Release/Dockerfile @@ -7,15 +7,4 @@ ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake -RUN git clone -b develop --depth=1 --shallow-submodules --recursive https://github.com/boostorg/boost.git && \ - cd boost && git submodule update -q && \ - ./bootstrap.sh --prefix=/usr/local/boost --with-libraries=container,filesystem,system,serialization,iostreams,program_options,thread,date_time,chrono && \ - ./b2 -d0 install -j4 && \ - cd .. && rm -rf boost - -RUN git clone --depth=1 --shallow-submodules https://gitlab.com/libeigen/eigen.git && \ - cd eigen && git submodule update --quiet --init --recursive && \ - mkdir build && cd build && \ - cmake .. && make install && cd .. && rm -rf eigen - LABEL org.cgal.releases_to_ignore="^(4|5\\.0)" From 1fd5d7a1af51bced63770ec36f742c5c2e50514f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Jun 2023 12:05:32 +0200 Subject: [PATCH 29/33] install qt6 on debian based distrib --- Debian-stable/Dockerfile | 13 ++++++++++++- Debian-testing/Dockerfile | 13 ++++++++++++- Ubuntu/Dockerfile | 13 ++++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/Debian-stable/Dockerfile b/Debian-stable/Dockerfile index 6742f7a..c40584b 100644 --- a/Debian-stable/Dockerfile +++ b/Debian-stable/Dockerfile @@ -18,7 +18,18 @@ RUN apt-get update && apt-get install -y \ zlib1g-dev \ libtbb-dev \ cmake \ - curl + curl \ + libqt6qmlworkerscript6 \ + qt6-svg-dev \ + qt6-base-dev \ + libqt6opengl6-dev \ + libqt6openglwidgets6 \ + libqt6qml6 \ + qt6-websockets-dev \ + qt6-networkauth-dev \ + libqt6chartsqml6 \ + qt6-declarative-dev + ENV CGAL_TEST_PLATFORM="Debian-Stable" ENV CGAL_CMAKE_FLAGS="(-DWITH_CGAL_Qt5=OFF \")" diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index 66f25eb..aadfa23 100644 --- a/Debian-testing/Dockerfile +++ b/Debian-testing/Dockerfile @@ -23,7 +23,18 @@ RUN apt-get clean && apt-get update && apt-get install -y \ libqt5opengl5-dev \ tar \ libtbb-dev \ - zlib1g-dev + zlib1g-dev \ + libqt6qmlworkerscript6 \ + qt6-svg-dev \ + qt6-base-dev \ + libqt6opengl6-dev \ + libqt6openglwidgets6 \ + libqt6qml6 \ + qt6-websockets-dev \ + qt6-networkauth-dev \ + libqt6chartsqml6 \ + qt6-declarative-dev + ENV CGAL_TEST_PLATFORM="Debian-Testing" ENV INIT_FILE=/tmp/init.cmake diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index e8c152f..a639f66 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -11,7 +11,18 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libmpfr-dev zlib1g-dev \ libeigen3-dev libipe-dev \ libmpfi-dev \ - libinsighttoolkit4-dev libtbb-dev git + libinsighttoolkit4-dev libtbb-dev git \ + libqt6qmlworkerscript6 \ + qt6-svg-dev \ + qt6-base-dev \ + libqt6opengl6-dev \ + libqt6openglwidgets6 \ + libqt6qml6 \ + qt6-websockets-dev \ + qt6-networkauth-dev \ + libqt6chartsqml6 \ + qt6-declarative-dev + RUN git clone https://github.com/STORM-IRIT/OpenGR.git --depth 1 \ && cd ./OpenGR \ From 1326cf779a9ef7ba82aed9fcadc2938dc19667df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Jun 2023 12:14:05 +0200 Subject: [PATCH 30/33] add qt6 for archlinux --- ArchLinux/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile index a82f249..436374c 100644 --- a/ArchLinux/Dockerfile +++ b/ArchLinux/Dockerfile @@ -17,6 +17,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \ glew glu mesa \ gmp mpfr mpfi ntl \ qt5-base qt5-script qt5-svg qt5-tools \ + qt6-base qt6-tools qt6-svg qt6-websockets\ intel-tbb \ && pacman -S --needed --noconfirm --asdeps \ freetype2 lua poppler python3 zlib \ From 22369bb17d5797e9f4074dd53a11c25ed8f8b2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Jun 2023 12:26:55 +0200 Subject: [PATCH 31/33] add qt6 to Fedora based distribs --- CentOS-7/Dockerfile | 3 +++ Fedora-32/Dockerfile | 3 +++ Fedora-rawhide/Dockerfile | 3 +++ Fedora/Dockerfile | 3 +++ 4 files changed, 12 insertions(+) diff --git a/CentOS-7/Dockerfile b/CentOS-7/Dockerfile index 6fdc115..2d4585f 100644 --- 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 diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index e99bc72..4916bb5 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -27,6 +27,9 @@ RUN dnf -y install \ qt5-qtscript-devel.i686 \ qt5-qtsvg-devel.i686 \ qt5-qttools-devel.i686 \ + qt6-qtbase-devel.i686 \ + qt6-qtsvg-devel.i686 \ + qt6-qttools-devel.i686 \ tar \ tbb-devel.i686 \ diffutils \ diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index f8f77c6..89c011a 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -13,6 +13,9 @@ RUN echo "install make cmake gcc-c++ \ 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 \ mesa-libGLU-devel \ OpenMesh-devel \ zlib-devel.x86_64 \ diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile index 8d5f1f5..3cee5cb 100644 --- a/Fedora/Dockerfile +++ b/Fedora/Dockerfile @@ -21,6 +21,9 @@ RUN dnf -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 \ unzip \ wget \ From 9a8d8f93dcf587022e657a5d78ac218ab67cfd75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Jun 2023 13:48:29 +0200 Subject: [PATCH 32/33] fix package name --- Ubuntu/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index a639f66..7eef1e8 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -13,13 +13,13 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libmpfi-dev \ libinsighttoolkit4-dev libtbb-dev git \ libqt6qmlworkerscript6 \ - qt6-svg-dev \ + libqt6-svg-dev \ qt6-base-dev \ libqt6opengl6-dev \ libqt6openglwidgets6 \ libqt6qml6 \ - qt6-websockets-dev \ - qt6-networkauth-dev \ + libqt6websockets6-dev \ + libqt6networkauth6-dev \ libqt6chartsqml6 \ qt6-declarative-dev From 04343ff01c440cc6b64863d67a85260a44ea29cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Jun 2023 15:07:53 +0200 Subject: [PATCH 33/33] fix package name --- Ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index 7eef1e8..8deb04e 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libmpfi-dev \ libinsighttoolkit4-dev libtbb-dev git \ libqt6qmlworkerscript6 \ - libqt6-svg-dev \ + libqt6svg6-dev \ qt6-base-dev \ libqt6opengl6-dev \ libqt6openglwidgets6 \