From 967ebe98d068cf97c5f0bd2b95f14c629dc08471 Mon Sep 17 00:00:00 2001
From: redsky17 <joedonofry@gmail.com>
Date: Thu, 14 Feb 2019 02:23:15 +0000
Subject: [PATCH] Adjust CI files for nlohmann
---
.ci/script.sh | 2 ++
Dockerfile | 10 ++++++++--
appveyor.yml | 1 +
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.ci/script.sh b/.ci/script.sh
index 4f0c5397d..a2f625126 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -26,6 +26,8 @@ if [ $TRAVIS_OS_NAME == linux ]; then
fi
if [ $TRAVIS_OS_NAME == osx ]; then
+ brew update
+ brew upgrade cmake boost
# Build dependencies.
cmake -Hdeps -B.deps -DCMAKE_BUILD_TYPE=Release \
-DUSE_BUNDLED_BOOST=OFF \
diff --git a/Dockerfile b/Dockerfile
index e8ed5af7a..6e89faede 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:14.04
ENV LIBSODIUM_VERSION=1.0.16
ENV SPDLOG_VERSION=1.1.0
ENV OLM_VERSION=2.2.2
-
+ENV NLOHMANN_VERSION=v3.2.0
ENV CMAKE_VERSION=3.12.1
ENV CMAKE_SHORT_VERSION=3.12
@@ -73,7 +73,13 @@ RUN \
cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release && \
cmake --build build --target install && \
# json.hpp
- curl -L https://github.com/nlohmann/json/releases/download/v3.2.0/json.hpp -o /usr/local/include/json.hpp && \
+ mkdir /build/json && cd /build/json && \
+ git clone --branch ${NLOHMANN_VERSION} --depth 1 https://github.com/nlohmann/json && \
+ cd json && \
+ cmake . && \
+ make && \
+ make install
+ #curl -L https://github.com/nlohmann/json/releases/download/v3.2.0/json.hpp -o /usr/local/include/json.hpp && \
rm -rf /build/* && \
rm -rf /var/lib/apt/lists/* && \
apt-get clean && \
diff --git a/appveyor.yml b/appveyor.yml
index e3a7b342d..e3a75c525 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,6 +17,7 @@ install:
- mingw32-make.exe --version
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
- vcpkg install
+ nlohmann-json:%PLATFORM%-windows
boost-asio:%PLATFORM%-windows
boost-beast:%PLATFORM%-windows
boost-iostreams:%PLATFORM%-windows
--
GitLab