Skip to content
Snippets Groups Projects
Commit dea7b711 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Update travis to use hunter

parent df6b8599
No related branches found
No related tags found
No related merge requests found
...@@ -11,12 +11,6 @@ if [ $TRAVIS_OS_NAME == linux ]; then ...@@ -11,12 +11,6 @@ if [ $TRAVIS_OS_NAME == linux ]; then
sudo bash cmake-install.sh --skip-license --prefix=/usr/local sudo bash cmake-install.sh --skip-license --prefix=/usr/local
export PATH="/usr/local/bin:$PATH" 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 mkdir -p build-lcov
( cd build-lcov ( cd build-lcov
curl -L http://downloads.sourceforge.net/ltp/lcov-1.14.tar.gz -o lcov-1.14.tar.gz curl -L http://downloads.sourceforge.net/ltp/lcov-1.14.tar.gz -o lcov-1.14.tar.gz
......
...@@ -17,15 +17,13 @@ if [ $TRAVIS_OS_NAME == linux ]; then ...@@ -17,15 +17,13 @@ if [ $TRAVIS_OS_NAME == linux ]; then
sudo update-alternatives --set g++ "/usr/bin/${CXX_VERSION}" sudo update-alternatives --set g++ "/usr/bin/${CXX_VERSION}"
sudo update-alternatives --set gcov "/usr/bin/gcov-8" 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. # Build the library.
cmake -GNinja -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug \ cmake -GNinja -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug \
-DBUILD_LIB_TESTS=ON \ -DBUILD_LIB_TESTS=ON \
-DBUILD_SHARED_LIBS=ON \ -DBUILD_SHARED_LIBS=ON \
-DCMAKE_INSTALL_PREFIX=.deps/usr \ -DHUNTER_ENABLED=ON \
-DHUNTER_ROOT=.deps \
-DUSE_BUNDLED_OPENSSL=OFF \
-DCOVERAGE=${COVERAGE} || true -DCOVERAGE=${COVERAGE} || true
cmake --build build cmake --build build
...@@ -45,7 +43,12 @@ if [ $TRAVIS_OS_NAME == osx ]; then ...@@ -45,7 +43,12 @@ if [ $TRAVIS_OS_NAME == osx ]; then
cmake -H. -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \ cmake -H. -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \
-DBUILD_LIB_TESTS=OFF \ -DBUILD_LIB_TESTS=OFF \
-DBUILD_SHARED_LIBS=ON \ -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 cmake --build build
make lint make lint
......
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