no message
This commit is contained in:
parent
53119f0bca
commit
a48d36e1ae
1 changed files with 14 additions and 17 deletions
11
.travis.yml
11
.travis.yml
|
@ -18,6 +18,8 @@ before_install:
|
||||||
- if [ "$CXX" = "g++" ]; then
|
- if [ "$CXX" = "g++" ]; then
|
||||||
if [[ ${TRAVIS_OS_NAME} = linux ]]; then
|
if [[ ${TRAVIS_OS_NAME} = linux ]]; then
|
||||||
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
|
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
|
||||||
|
sudo apt-get install -qq g++-4.8;
|
||||||
|
export CXX="g++-4.8";
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -25,6 +27,8 @@ before_install:
|
||||||
- if [ "$CXX" = "clang++" ]; then
|
- if [ "$CXX" = "clang++" ]; then
|
||||||
if [[ ${TRAVIS_OS_NAME} = linux ]]; then
|
if [[ ${TRAVIS_OS_NAME} = linux ]]; then
|
||||||
sudo add-apt-repository -y ppa:h-rayflood/llvm;
|
sudo add-apt-repository -y ppa:h-rayflood/llvm;
|
||||||
|
sudo apt-get install -qq clang-3.4;
|
||||||
|
export CXX="clang++-3.4";
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -33,13 +37,6 @@ before_install:
|
||||||
install:
|
install:
|
||||||
|
|
||||||
- 'if [ ${TRAVIS_OS_NAME} = linux ]; then
|
- 'if [ ${TRAVIS_OS_NAME} = linux ]; then
|
||||||
if [ "$CXX" = "g++" ]; then
|
|
||||||
sudo apt-get install -qq g++-4.8;
|
|
||||||
export CXX="g++-4.8";
|
|
||||||
else
|
|
||||||
sudo apt-get install -qq clang-3.4;
|
|
||||||
export CXX="clang++-3.4";
|
|
||||||
fi;
|
|
||||||
sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev;
|
sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev;
|
||||||
sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall;
|
sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall;
|
||||||
# Getting newest boost
|
# Getting newest boost
|
||||||
|
|
Loading…
Reference in a new issue