From 80b2c7c5b2dd7ca852af019ea622ff579280840e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Aug 2024 15:11:58 +0200 Subject: [PATCH 1/8] readd qt6 now that the kernel has been updated --- Ubuntu/Dockerfile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index eca3e9e..b0e7931 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -15,15 +15,13 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libinsighttoolkit5-dev libtbb-dev git \ nlohmann-json3-dev \ lsb-release \ - libyaml-cpp-dev - -# cgal.gf.com kernel does not seem compatible with qt6 -# libgl-dev \ -# qt6-base-dev \ -# qt6-declarative-dev \ -# libqt6opengl6-dev \ -# libqt6svg6-dev \ -# libqt6websockets6-dev + libyaml-cpp-dev \ + libgl-dev \ + qt6-base-dev \ + qt6-declarative-dev \ + libqt6opengl6-dev \ + libqt6svg6-dev \ + libqt6websockets6-dev RUN git clone https://github.com/STORM-IRIT/OpenGR.git --depth 1 \ && cd ./OpenGR \ From eaf49d2073a500e043ee150c08e1c0b6c301cbd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Aug 2024 15:13:23 +0200 Subject: [PATCH 2/8] add vtk on debian testing --- Debian-testing/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index 3bc6561..f3ecd28 100644 --- a/Debian-testing/Dockerfile +++ b/Debian-testing/Dockerfile @@ -36,6 +36,7 @@ RUN apt-get clean && apt-get update && apt-get install -y \ libqt6chartsqml6 \ qt6-declarative-dev \ lsb-release \ + libvtk9-dev vtk9 \ nlohmann-json3-dev From 5cc037679537b2159e14581afdc43fddbeaa0d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Aug 2024 15:24:21 +0200 Subject: [PATCH 3/8] update named of renamed package --- Debian-testing/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index f3ecd28..9bd2e9b 100644 --- a/Debian-testing/Dockerfile +++ b/Debian-testing/Dockerfile @@ -33,7 +33,7 @@ RUN apt-get clean && apt-get update && apt-get install -y \ libqt6qml6 \ qt6-websockets-dev \ qt6-networkauth-dev \ - libqt6chartsqml6 \ + qml6-module-qtcharts \ qt6-declarative-dev \ lsb-release \ libvtk9-dev vtk9 \ From 5551254006519194a1a5b7c9683f4fdba4f017c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Aug 2024 15:49:47 +0200 Subject: [PATCH 4/8] update TBB installation --- Fedora-rawhide/Dockerfile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 87b982c..1745471 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -28,9 +28,16 @@ RUN dnf -y upgrade && \ json-devel \ tar && \ 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 + +#install TBB +wget https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.8.0.tar.gz +tar xf v2021.8.0.tar.gz +mkdir build +cd build +sed -i '1i #include ' /oneTBB-2021.8.0/test/common/utils_assert.h +cmake -DCMAKE_BUILD_TYPE=Release -DTBB_STRICT:BOOL=OFF -DTBB_TEST:BOOL=OFF ../oneTBB-2021.8.0 +make +make install ENV CGAL_TEST_PLATFORM="Fedora-rawhide" ENV CGAL_CMAKE_FLAGS="('-DCGAL_HEADER_ONLY:BOOL=TRUE')" From 52c74be074e751727b3d21481681283f1378ffb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Aug 2024 16:00:38 +0200 Subject: [PATCH 5/8] fix syntax --- Fedora-rawhide/Dockerfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 1745471..73b213f 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -28,16 +28,14 @@ RUN dnf -y upgrade && \ json-devel \ tar && \ dnf clean all && \ - -#install TBB -wget https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.8.0.tar.gz -tar xf v2021.8.0.tar.gz -mkdir build -cd build -sed -i '1i #include ' /oneTBB-2021.8.0/test/common/utils_assert.h -cmake -DCMAKE_BUILD_TYPE=Release -DTBB_STRICT:BOOL=OFF -DTBB_TEST:BOOL=OFF ../oneTBB-2021.8.0 -make -make install + wget https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.8.0.tar.gz && \ + tar xf v2021.8.0.tar.gz && \ + mkdir build && \ + cd build && \ + sed -i '1i #include ' /oneTBB-2021.8.0/test/common/utils_assert.h && \ + cmake -DCMAKE_BUILD_TYPE=Release -DTBB_STRICT:BOOL=OFF -DTBB_TEST:BOOL=OFF ../oneTBB-2021.8.0 && \ + make && \ + make install ENV CGAL_TEST_PLATFORM="Fedora-rawhide" ENV CGAL_CMAKE_FLAGS="('-DCGAL_HEADER_ONLY:BOOL=TRUE')" From 3e9db5a656585b20471378c22c9332c1dbaadbc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Aug 2024 16:09:39 +0200 Subject: [PATCH 6/8] clean up --- Fedora-rawhide/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 73b213f..8383e67 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -35,7 +35,8 @@ RUN dnf -y upgrade && \ sed -i '1i #include ' /oneTBB-2021.8.0/test/common/utils_assert.h && \ cmake -DCMAKE_BUILD_TYPE=Release -DTBB_STRICT:BOOL=OFF -DTBB_TEST:BOOL=OFF ../oneTBB-2021.8.0 && \ make && \ - make install + make install && \ + cd .. && rm -rf v2021.8.0.tar.gz oneTBB-2021.8.0 build ENV CGAL_TEST_PLATFORM="Fedora-rawhide" ENV CGAL_CMAKE_FLAGS="('-DCGAL_HEADER_ONLY:BOOL=TRUE')" From 50dec06d6846697a6d44785b559ef983260c0c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Aug 2024 17:44:02 +0200 Subject: [PATCH 7/8] update ceres build --- Ubuntu/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index b0e7931..c40d1d4 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -86,6 +86,7 @@ RUN git clone https://github.com/scipopt/scip \ RUN git clone https://ceres-solver.googlesource.com/ceres-solver \ && cd ceres-solver \ + && git submodule update --init --recursive \ && mkdir build \ && cd build \ && cmake -DMINIGLOG=ON -DMINIGLOG_MAX_LOG_LEVEL=0 .. \ From d586e7d8b8dbabddcdef102ac178b5dd3ba2fc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 19 Aug 2024 18:28:56 +0200 Subject: [PATCH 8/8] use ceres 2.2.0 master version is currently depending on absl:log which needs to be handle at CGAL level AFAIU --- Ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index c40d1d4..9c7cac0 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -86,7 +86,7 @@ RUN git clone https://github.com/scipopt/scip \ RUN git clone https://ceres-solver.googlesource.com/ceres-solver \ && cd ceres-solver \ - && git submodule update --init --recursive \ + && git checkout 2.2.0 \ && mkdir build \ && cd build \ && cmake -DMINIGLOG=ON -DMINIGLOG_MAX_LOG_LEVEL=0 .. \