Skip to content

Commit

Permalink
[Travis] Use system Boost and VTK.
Browse files Browse the repository at this point in the history
  • Loading branch information
bilke committed Mar 23, 2017
1 parent f09009c commit 4dfc9a3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/travis/vtk.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 4dfc9a3

Please sign in to comment.