From dea7b71173645ca79ce109a3f1b32e66819dbdc7 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Fri, 17 Jan 2020 21:48:59 +0100
Subject: [PATCH] Update travis to use hunter
---
.ci/install.sh | 6 ------
.ci/script.sh | 15 +++++++++------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/.ci/install.sh b/.ci/install.sh
index 89984491f..6ddbc43b7 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -11,12 +11,6 @@ if [ $TRAVIS_OS_NAME == linux ]; then
sudo bash cmake-install.sh --skip-license --prefix=/usr/local
export PATH="/usr/local/bin:$PATH"
- mkdir -p build-libsodium
- ( cd build-libsodium
- curl -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.17.tar.gz -o libsodium-1.0.17.tar.gz
- tar xfz libsodium-1.0.17.tar.gz
- cd libsodium-1.0.17/
- ./configure && make && sudo make install )
mkdir -p build-lcov
( cd build-lcov
curl -L http://downloads.sourceforge.net/ltp/lcov-1.14.tar.gz -o lcov-1.14.tar.gz
diff --git a/.ci/script.sh b/.ci/script.sh
index 923b78416..f618a5a8f 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -17,15 +17,13 @@ if [ $TRAVIS_OS_NAME == linux ]; then
sudo update-alternatives --set g++ "/usr/bin/${CXX_VERSION}"
sudo update-alternatives --set gcov "/usr/bin/gcov-8"
- # Build dependencies.
- cmake -GNinja -Hdeps -B.deps -DCMAKE_BUILD_TYPE=Debug
- cmake --build .deps
-
# Build the library.
cmake -GNinja -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug \
-DBUILD_LIB_TESTS=ON \
-DBUILD_SHARED_LIBS=ON \
- -DCMAKE_INSTALL_PREFIX=.deps/usr \
+ -DHUNTER_ENABLED=ON \
+ -DHUNTER_ROOT=.deps \
+ -DUSE_BUNDLED_OPENSSL=OFF \
-DCOVERAGE=${COVERAGE} || true
cmake --build build
@@ -45,7 +43,12 @@ if [ $TRAVIS_OS_NAME == osx ]; then
cmake -H. -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \
-DBUILD_LIB_TESTS=OFF \
-DBUILD_SHARED_LIBS=ON \
- -DCMAKE_INSTALL_PREFIX=.deps/usr || true
+ -DHUNTER_ENABLED=ON \
+ -DHUNTER_ROOT=.deps \
+ -DUSE_BUNDLED_OPENSSL=OFF \
+ -DUSE_BUNDLED_BOOST=OFF \
+ -DUSE_BUNDLED_GTEST=OFF \
+ -DUSE_BUNDLED_JSON=OFF || true
cmake --build build
make lint
--
GitLab