Another attempt
This commit is contained in:
parent
9868965840
commit
b6401a196d
1 changed files with 8 additions and 7 deletions
13
.travis.yml
13
.travis.yml
|
@ -16,7 +16,7 @@ os:
|
||||||
before_install:
|
before_install:
|
||||||
# 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;
|
||||||
|
@ -26,7 +26,7 @@ before_install:
|
||||||
|
|
||||||
# clang 3.4
|
# clang 3.4
|
||||||
- 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 update -qq;
|
||||||
sudo apt-get install -qq clang-3.4;
|
sudo apt-get install -qq clang-3.4;
|
||||||
|
@ -34,9 +34,8 @@ before_install:
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
install:
|
# Dependencies for OpenCV 3.1
|
||||||
|
- 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;
|
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
|
||||||
|
@ -48,7 +47,7 @@ install:
|
||||||
brew tap homebrew/science;
|
brew tap homebrew/science;
|
||||||
/usr/bin/yes | pip uninstall numpy;
|
/usr/bin/yes | pip uninstall numpy;
|
||||||
brew install tbb
|
brew install tbb
|
||||||
fi'
|
fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
# Installing openCV 3.1
|
# Installing openCV 3.1
|
||||||
|
@ -57,6 +56,7 @@ before_script:
|
||||||
- cd opencv-3.1.0
|
- cd opencv-3.1.0
|
||||||
- sudo mkdir build
|
- sudo mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
|
- $CXX --version
|
||||||
- if [ "$CXX" = "g++" ]; then 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 .. ; fi
|
- if [ "$CXX" = "g++" ]; then 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 .. ; fi
|
||||||
- if [ "$CXX" = "clang++" ]; then sudo cmake -D CMAKE_CXX_COMPILER=clang++ -D CMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++ -I/usr/include/libcxxabi" -D CMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++ -lc++abi" -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
|
- if [ "$CXX" = "clang++" ]; then sudo cmake -D CMAKE_CXX_COMPILER=clang++ -D CMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++ -I/usr/include/libcxxabi" -D CMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++ -lc++abi" -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
|
||||||
- sudo make -j4
|
- sudo make -j4
|
||||||
|
@ -65,6 +65,7 @@ before_script:
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- $CXX --version
|
- $CXX --version
|
||||||
|
- echo $CXX
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- cmake -D CMAKE_BUILD_TYPE=RELEASE ..
|
- cmake -D CMAKE_BUILD_TYPE=RELEASE ..
|
||||||
|
|
Loading…
Reference in a new issue