Merge pull request #151 from sloriot/add-nlohmann-json

Add nlohmann-json
CGAL · Mar 28, 2024 · 59067d8 · 59067d8
2 parents ea2b1ea + 4ccd8fe
commit 59067d8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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