Another attempt at a travis fix.
This commit is contained in:
parent
bcedb8b8ba
commit
5edd3ab407
1 changed files with 20 additions and 19 deletions
39
.travis.yml
39
.travis.yml
|
@ -16,27 +16,28 @@ before_install:
|
||||||
|
|
||||||
# OpenCV dependencies and boost
|
# OpenCV dependencies and boost
|
||||||
- if [ ${TRAVIS_OS_NAME} = linux ]; then
|
- if [ ${TRAVIS_OS_NAME} = linux ]; then
|
||||||
sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev;
|
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;
|
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 cmake
|
apt-get install cmake
|
||||||
sudo add-apt-repository -y ppa:boost-latest/ppa;
|
#sudo add-apt-repository -y ppa:boost-latest/ppa;
|
||||||
sudo apt-get update;
|
apt-get update;
|
||||||
sudo apt-get install libboost1.55-all-dev;
|
apt-get install libboost1.55-all-dev;
|
||||||
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;
|
unzip 3.1.0.zip;
|
||||||
cd opencv-3.1.0;
|
opencv-3.1.0;
|
||||||
sudo mkdir build;
|
mkdir build;
|
||||||
cd build;
|
build;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# g++4.8.1
|
# g++4.8.1
|
||||||
- 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 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";
|
||||||
sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF ..;
|
$CXX --version;
|
||||||
|
cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF ..;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -44,8 +45,8 @@ before_install:
|
||||||
- if [ "$CXX" = "clang++" ]; then
|
- if [ "$CXX" = "clang++" ]; then
|
||||||
if [ ${TRAVIS_OS_NAME} = linux ]; then
|
if [ ${TRAVIS_OS_NAME} = linux ]; then
|
||||||
$CXX --version;
|
$CXX --version;
|
||||||
sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers;
|
#sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers;
|
||||||
sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D WITH_TBB=ON ..;
|
cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D WITH_TBB=ON ..;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -61,8 +62,8 @@ before_install:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- sudo make -j4
|
- make -j4
|
||||||
- sudo make install
|
- make install
|
||||||
- cd ../..
|
- cd ../..
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
|
Loading…
Reference in a new issue