Another test
This commit is contained in:
parent
a48d36e1ae
commit
9868965840
1 changed files with 6 additions and 5 deletions
|
@ -18,6 +18,7 @@ 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 update -qq;
|
||||||
sudo apt-get install -qq g++-4.8;
|
sudo apt-get install -qq g++-4.8;
|
||||||
export CXX="g++-4.8";
|
export CXX="g++-4.8";
|
||||||
fi
|
fi
|
||||||
|
@ -27,13 +28,12 @@ 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 update -qq;
|
||||||
sudo apt-get install -qq clang-3.4;
|
sudo apt-get install -qq clang-3.4;
|
||||||
export CXX="clang++-3.4";
|
export CXX="clang++-3.4";
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get update -qq; fi
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
|
||||||
- 'if [ ${TRAVIS_OS_NAME} = linux ]; then
|
- 'if [ ${TRAVIS_OS_NAME} = linux ]; then
|
||||||
|
@ -50,6 +50,7 @@ install:
|
||||||
brew install tbb
|
brew install tbb
|
||||||
fi'
|
fi'
|
||||||
|
|
||||||
|
before_script:
|
||||||
# Installing openCV 3.1
|
# Installing openCV 3.1
|
||||||
- wget https://github.com/Itseez/opencv/archive/3.1.0.zip
|
- wget https://github.com/Itseez/opencv/archive/3.1.0.zip
|
||||||
- sudo unzip 3.1.0.zip
|
- sudo unzip 3.1.0.zip
|
||||||
|
|
Loading…
Reference in a new issue