From 823f98853693c6ee2efe4524cdd9d8b8261f91fd Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Mon, 15 Mar 2021 21:25:00 +0200 Subject: [PATCH] travis: Use system JSON package --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f459230b1a..75dd841c43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,11 @@ before_install: install: - | sudo apt-get install -y \ - libocct-data-exchange-dev libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev \ + libocct-data-exchange-dev libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev nlohmann-json3-dev \ libboost-system-dev libboost-program-options-dev libboost-regex-dev libboost-thread-dev libboost-date-time-dev libboost-iostreams-dev libboost-filesystem-dev \ build-essential cmake python2.7 libpython2.7-dev swig zlib1g liblzma5 opencollada-dev wget apt-transport-https - - sudo mkdir -p /usr/include/json/nlohmann/ - - sudo wget https://github.com/nlohmann/json/releases/download/v3.6.1/json.hpp -O /usr/include/json/nlohmann/json.hpp + #- sudo mkdir -p /usr/include/json/nlohmann/ + #- sudo wget https://github.com/nlohmann/json/releases/download/v3.6.1/json.hpp -O /usr/include/json/nlohmann/json.hpp # - sudo sh -c 'curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -' # - sudo sh -c 'curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list' # - sudo apt-get update -qq && sudo apt-get install -y dart @@ -42,7 +42,7 @@ script: -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \ -DLIBXML2_LIBRARIES="/usr/lib/x86_64-linux-gnu/libxml2.so;/lib/x86_64-linux-gnu/libz.so.1;/lib/x86_64-linux-gnu/liblzma.so.5;/usr/lib/x86_64-linux-gnu/libicuuc.so.60;/usr/lib/x86_64-linux-gnu/libicudata.so.60" \ -DGLTF_SUPPORT=On \ - -DJSON_INCLUDE_DIR=/usr/include/json \ + -DJSON_INCLUDE_DIR=/usr/include \ ../cmake - sudo make -j$(nproc) install