Skip to content

Commit

Permalink
Merge pull request #148 from sloriot/ubuntu-disable-qt6
Browse files Browse the repository at this point in the history
disable qt6
  • Loading branch information
sloriot authored Nov 14, 2023
2 parents d9a4e09 + 1ba77e6 commit 54cd361
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ArchLinux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +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\
qt6-base qt6-tools qt6-svg qt6-websockets qt6-declarative \
intel-tbb \
&& pacman -S --needed --noconfirm --asdeps \
freetype2 lua poppler python3 zlib \
Expand Down
9 changes: 9 additions & 0 deletions Ubuntu-NO_DEPRECATED_CODE/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ FROM cgal/testsuite-docker:ubuntu
ARG dockerfile_url
ENV DOCKERFILE_URL=$dockerfile_url

#add qt6 as it is not run on cgal.gf.com
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
libgl-dev \
qt6-base-dev \
qt6-declarative-dev \
libqt6opengl6-dev \
libqt6svg6-dev \
libqt6websockets6-dev

ENV CGAL_TEST_PLATFORM="Ubuntu-Latest-NO_DEPRECATED_CODE"
ENV CGAL_CMAKE_FLAGS="(\"-DCGAL_CXX_FLAGS=-DCGAL_NO_DEPRECATED_CODE\")"
ENV INIT_FILE=/tmp/init.cmake
Expand Down
16 changes: 9 additions & 7 deletions Ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ 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 \
libgl-dev \
qt6-base-dev \
qt6-declarative-dev \
libqt6opengl6-dev \
libqt6svg6-dev \
libqt6websockets6-dev
libinsighttoolkit4-dev libtbb-dev git

# cgal.gf.com kernel does not seem compatible with qt6
# 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 \
Expand Down

0 comments on commit 54cd361

Please sign in to comment.