From ecb0160697a47705b491106801b759b647d8fc9b Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 9 Mar 2017 20:36:14 +0100
Subject: [PATCH] [Travis] Use system Boost and VTK.
---
.travis.yml | 6 +++---
scripts/travis/vtk.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index fa81978044a..6538eb623dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,13 +18,13 @@ cache:
ccache: true
directories:
- $HOME/cmake-3.1.1-Linux-x86_64
- - $HOME/VTK-Install
+ - $HOME/VTK-Install-7.1
- $HOME/boost_1_56_0
- $HOME/.conan
env:
global:
- - VTK_DIR=$HOME/VTK-Install/lib/cmake/vtk-7.1
+ - VTK_DIR=$HOME/VTK-Install-7.1/lib/cmake/vtk-7.1
- BOOST_ROOT=$HOME/boost_1_56_0
matrix:
include:
@@ -55,7 +55,7 @@ script:
- if [ "$CASE" == "CHECK" ]; then git config core.whitespace -blank-at-eof; git diff --check `git merge-base origin/master HEAD` HEAD; fi
- if [ "$CASE" != "CHECK" ]; then mkdir build; fi
- if [ "$CASE" != "CHECK" ]; then cd build; fi
- - if [ "$CASE" != "CHECK" ]; then cmake $CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug ..; fi
+ - if [ "$CASE" != "CHECK" ]; then cmake $CMAKE_ARGS -DOGS_LIB_BOOST=System -DOGS_LIB_VTK=System -DCMAKE_BUILD_TYPE=Debug ..; fi
- if [ "$CASE" != "CHECK" ]; then make -j 2; fi
- if [ "$CASE" != "CHECK" ]; then make tests; fi
diff --git a/scripts/travis/vtk.sh b/scripts/travis/vtk.sh
index bd8dab74f31..6cf9db77d52 100644
--- a/scripts/travis/vtk.sh
+++ b/scripts/travis/vtk.sh
@@ -1,6 +1,6 @@
#!/bin/sh
set -e
-if [ ! -d "$HOME/VTK-Install/include" ]; then
+if [ ! -d "$HOME/VTK-Install-7.1/include" ]; then
cd $HOME
wget http://ogsstorage.blob.core.windows.net/jenkins/ogs6-lib-sources/vtk-7.1.0-binary.tar.gz
tar -xzf vtk-7.1.0-binary.tar.gz
--
GitLab