From 4ccd8febdd220dcb6ff3f5cf6e8afa488b9895ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 28 Mar 2024 09:52:23 +0100 Subject: [PATCH] add nlohmann-json --- ArchLinux/Dockerfile | 1 + Debian-stable/Dockerfile | 3 ++- Debian-testing/Dockerfile | 3 ++- Fedora-32/Dockerfile | 1 + Fedora-rawhide/Dockerfile | 1 + Fedora/Dockerfile | 3 ++- Ubuntu/Dockerfile | 1 + 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ArchLinux/Dockerfile b/ArchLinux/Dockerfile index 3c6cc47..5ae44cb 100644 --- a/ArchLinux/Dockerfile +++ b/ArchLinux/Dockerfile @@ -19,6 +19,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \ qt5-base qt5-script qt5-svg qt5-tools \ qt6-base qt6-tools qt6-svg qt6-websockets qt6-declarative \ intel-tbb \ + nlohmann-json \ && pacman -S --needed --noconfirm --asdeps \ freetype2 lua poppler python3 zlib \ tcsh \ diff --git a/Debian-stable/Dockerfile b/Debian-stable/Dockerfile index 8f73087..5a214b5 100644 --- a/Debian-stable/Dockerfile +++ b/Debian-stable/Dockerfile @@ -29,7 +29,8 @@ RUN apt-get update && apt-get install -y \ qt6-websockets-dev \ qt6-networkauth-dev \ libqt6chartsqml6 \ - qt6-declarative-dev + qt6-declarative-dev \ + nlohmann-json3-dev ENV CGAL_TEST_PLATFORM="Debian-Stable" diff --git a/Debian-testing/Dockerfile b/Debian-testing/Dockerfile index e5bc0bf..9bf63c6 100644 --- a/Debian-testing/Dockerfile +++ b/Debian-testing/Dockerfile @@ -34,7 +34,8 @@ RUN apt-get clean && apt-get update && apt-get install -y \ qt6-websockets-dev \ qt6-networkauth-dev \ libqt6chartsqml6 \ - qt6-declarative-dev + qt6-declarative-dev \ + nlohmann-json3-dev ENV CGAL_TEST_PLATFORM="Debian-Testing" diff --git a/Fedora-32/Dockerfile b/Fedora-32/Dockerfile index 9fddd6d..9d7a86b 100644 --- a/Fedora-32/Dockerfile +++ b/Fedora-32/Dockerfile @@ -32,6 +32,7 @@ RUN dnf -y install \ tbb-devel.i686 \ diffutils \ git \ + json-devel \ zlib-devel.i686 && dnf clean all RUN ln -s /usr/lib64/qt5/bin/qhelpgenerator /usr/lib/qt5/bin/qhelpgenerator diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 18d5add..d32b3f8 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -24,6 +24,7 @@ RUN dnf -y upgrade && \ diffutils \ wget \ git \ + 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 && \ diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile index 200ae55..ac48813 100644 --- a/Fedora/Dockerfile +++ b/Fedora/Dockerfile @@ -33,7 +33,8 @@ RUN dnf -y install \ zlib-devel.x86_64 \ diffutils.x86_64 \ git \ - libssh-devel + libssh-devel \ + json-devel RUN wget "https://github.com/CGAL/LAStools/archive/LAStools-2020-11-09.zip" -O laslib.zip \ && unzip laslib.zip \ diff --git a/Ubuntu/Dockerfile b/Ubuntu/Dockerfile index 50a91a8..97a89db 100644 --- a/Ubuntu/Dockerfile +++ b/Ubuntu/Dockerfile @@ -13,6 +13,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libeigen3-dev libipe-dev \ libmpfi-dev \ libinsighttoolkit4-dev libtbb-dev git \ + nlohmann-json3-dev \ libyaml-cpp-dev # cgal.gf.com kernel does not seem compatible with qt6