Skip to content
Snippets Groups Projects
Commit 967ebe98 authored by Joe Donofry's avatar Joe Donofry
Browse files

Adjust CI files for nlohmann

parent 33fe0150
No related branches found
No related tags found
No related merge requests found
......@@ -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 \
......
......@@ -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 && \
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment