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" 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 }} 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-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-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-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 956f4ed..436374c 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 @@ -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 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/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 6d5c3ce..0000000 --- a/CentOS-6-32/Dockerfile +++ /dev/null @@ -1,64 +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 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 - -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 43255ca..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="(\"-DWITH_CGAL_Qt3:BOOL=OFF\" \"-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 dd406da..0000000 --- a/CentOS-6/Dockerfile +++ /dev/null @@ -1,44 +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_* - -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 - -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/CentOS-7/Dockerfile b/CentOS-7/Dockerfile index 0bebe55..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 @@ -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. 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..c40584b 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 \ @@ -19,9 +18,20 @@ 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_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-clang-main/Dockerfile b/Debian-testing-clang-main/Dockerfile new file mode 100644 index 0000000..4913844 --- /dev/null +++ b/Debian-testing-clang-main/Dockerfile @@ -0,0 +1,14 @@ +FROM debian:testing +ARG dockerfile_url +ENV DOCKERFILE_URL=$dockerfile_url + +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++ +ENV CC=/usr/bin/clang +ENV CGAL_TEST_PLATFORM="Debian-testing-clang-main" diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index cf219b8..aadfa23 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 \ @@ -24,9 +23,19 @@ 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 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 8b633fe..4916bb5 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 \ @@ -14,7 +15,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,19 +23,21 @@ 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 \ qt5-qttools-devel.i686 \ + qt6-qtbase-devel.i686 \ + qt6-qtsvg-devel.i686 \ + qt6-qttools-devel.i686 \ tar \ - tbb-devel \ + tbb-devel.i686 \ diffutils \ zlib-devel.i686 && dnf clean all 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-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/Dockerfile b/Fedora-rawhide/Dockerfile index 3ecda09..89c011a 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -2,8 +2,8 @@ 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++ \ + util-linux \ gmp-devel.x86_64 mpfr-devel.x86_64 \ boost-devel.x86_64 \ ntl-devel.x86_64 \ @@ -13,17 +13,22 @@ 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 \ + qt6-qtbase-devel.x86_64 \ + qt6-qtsvg-devel.x86_64 \ + qt6-qttools-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 shell dnf-cmd && rm dnf-cmd && \ - dnf clean all + 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 && \ + 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')" 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-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-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/Dockerfile b/Fedora/Dockerfile index a85bc96..3cee5cb 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 \ @@ -22,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 \ 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-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-CXX1Z/init.cmake b/Ubuntu-GCC6-CXX1Z/init.cmake index 3419983..9552257 100644 --- a/Ubuntu-GCC6-CXX1Z/init.cmake +++ b/Ubuntu-GCC6-CXX1Z/init.cmake @@ -1,5 +1,7 @@ -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 "") 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/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-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 f1fd597..7528c73 100644 --- a/Ubuntu-GCC6/Dockerfile +++ b/Ubuntu-GCC6/Dockerfile @@ -27,8 +27,19 @@ 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\" \"-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-GCC6/init.cmake b/Ubuntu-GCC6/init.cmake index ec9593a..eff7bb7 100644 --- a/Ubuntu-GCC6/init.cmake +++ b/Ubuntu-GCC6/init.cmake @@ -1,5 +1,7 @@ -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 "") 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 1c07063..d98e328 100644 --- a/Ubuntu-GCC_master_cpp20-Release/Dockerfile +++ b/Ubuntu-GCC_master_cpp20-Release/Dockerfile @@ -3,19 +3,8 @@ 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 -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 && \ - ./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)" 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 "") 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..8deb04e 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -10,8 +10,19 @@ 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 \ - libinsighttoolkit4-dev libtbb-dev git + libmpfi-dev \ + libinsighttoolkit4-dev libtbb-dev git \ + libqt6qmlworkerscript6 \ + libqt6svg6-dev \ + qt6-base-dev \ + libqt6opengl6-dev \ + libqt6openglwidgets6 \ + libqt6qml6 \ + libqt6websockets6-dev \ + libqt6networkauth6-dev \ + libqt6chartsqml6 \ + qt6-declarative-dev + RUN git clone https://github.com/STORM-IRIT/OpenGR.git --depth 1 \ && cd ./OpenGR \ @@ -28,19 +39,20 @@ 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 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 -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 - + RUN git clone --recursive https://github.com/oxfordcontrol/osqp \ && cd ./osqp \ && mkdir build \ @@ -51,6 +63,36 @@ RUN git clone --recursive https://github.com/oxfordcontrol/osqp \ && 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 -DMINIGLOG=ON -DMINIGLOG_MAX_LOG_LEVEL=0 .. \ + && 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 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/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}" 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 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)