From 3b708a890eb0d981b33bbac81d6474e61ee4dcc2 Mon Sep 17 00:00:00 2001
From: Hauke Moenck <hauke_moenck@gmx.de>
Date: Thu, 25 Oct 2018 15:29:43 +0200
Subject: [PATCH] Added fusimulator dependencies
---
ubuntu-18.04/Dockerfile | 4 +++-
windows/Dockerfile | 8 ++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ubuntu-18.04/Dockerfile b/ubuntu-18.04/Dockerfile
index 8c08985..e057742 100644
--- a/ubuntu-18.04/Dockerfile
+++ b/ubuntu-18.04/Dockerfile
@@ -121,7 +121,9 @@ RUN apt-get install -y \
libglm-dev \
libegl1-mesa-dev \
libcgal-dev \
- libcgal-qt5-dev
+ libcgal-qt5-dev \
+ libjsoncpp-dev \
+ libwebsocketpp-dev
RUN python3.6 -m pip --no-cache-dir install \
numpy \
diff --git a/windows/Dockerfile b/windows/Dockerfile
index d283cd5..a5235c5 100644
--- a/windows/Dockerfile
+++ b/windows/Dockerfile
@@ -76,7 +76,9 @@ RUN cd $Env:VCPKG_DIR; \
pybind11:$vcpkg_triplet \
boost-program-options:$vcpkg_triplet \
boost-bimap:$vcpkg_triplet \
- boost-property-tree:$vcpkg_triplet; \
+ boost-property-tree:$vcpkg_triplet \
+ jsoncpp:$vcpkg_triplet \
+ websocketpp:$vcpkg_triplet; \
./vcpkg install opencv[ffmpeg,ximea,cuda,opengl]:$vcpkg_triplet; \
./vcpkg install mxnet[cpp,opencv,cuda,cudnn]:$vcpkg_triplet; \
Copy-Item ./downloads/tools/flang/5.0.0/Library/bin/flang.dll ./installed/$vcpkg_triplet/bin/; \
@@ -95,7 +97,9 @@ RUN cd $Env:VCPKG_DIR; \
pybind11:$vcpkg_triplet \
boost-program-options:$vcpkg_triplet \
boost-bimap:$vcpkg_triplet \
- boost-property-tree:$vcpkg_triplet; \
+ boost-property-tree:$vcpkg_triplet \
+ jsoncpp:$vcpkg_triplet \
+ websocketpp:$vcpkg_triplet; \
./vcpkg install opencv[ffmpeg,ximea,opengl]:$vcpkg_triplet; \
./vcpkg install mxnet[cpp,opencv]:$vcpkg_triplet; \
Copy-Item ./downloads/tools/flang/5.0.0/Library/bin/flang.dll ./installed/$vcpkg_triplet/bin/; \
--
GitLab