Merge pull request #160 from sloriot/vtk_qt6_update

Readd qt6 on Ubuntu and add vtk on debian testing

Debian-testing/Dockerfile

@@ -33,9 +33,10 @@ 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 \
  nlohmann-json3-dev
 
 

Fedora-rawhide/Dockerfile

@@ -28,9 +28,15 @@ 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
+ 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 <cstdlib>' /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 && \
+ 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')"

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 \
@@ -88,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 checkout 2.2.0 \
  && mkdir build \
  && cd build \
  && cmake -DMINIGLOG=ON -DMINIGLOG_MAX_LOG_LEVEL=0 .. \