Updating travis to build newest openCV.
This commit is contained in:
parent
06de82efd8
commit
9be351d289
2 changed files with 7 additions and 11 deletions
16
.travis.yml
16
.travis.yml
|
@ -13,6 +13,7 @@ compiler:
|
||||||
|
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
|
- osx
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
|
|
||||||
|
@ -24,9 +25,9 @@ before_install:
|
||||||
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;
|
||||||
sudo apt-get install cmake;
|
sudo apt-get install cmake;
|
||||||
sudo apt-get install libboost1.55-all-dev;
|
sudo apt-get install libboost1.55-all-dev;
|
||||||
wget https://github.com/Itseez/opencv/archive/3.1.0.zip;
|
wget https://github.com/opencv/opencv/archive/3.4.0.zip;
|
||||||
unzip -q 3.1.0.zip;
|
unzip -q 3.4.0.zip;
|
||||||
cd opencv-3.1.0;
|
cd opencv-3.4.0;
|
||||||
mkdir build;
|
mkdir build;
|
||||||
cd build;
|
cd build;
|
||||||
fi
|
fi
|
||||||
|
@ -51,13 +52,8 @@ before_install:
|
||||||
brew update;
|
brew update;
|
||||||
brew install tbb;
|
brew install tbb;
|
||||||
brew tap homebrew/science;
|
brew tap homebrew/science;
|
||||||
brew install vtk;
|
brew install tbb opencv3;
|
||||||
wget https://github.com/Itseez/opencv/archive/3.1.0.zip;
|
brew install boost;
|
||||||
unzip -q 3.1.0.zip;
|
|
||||||
cd opencv-3.1.0;
|
|
||||||
sudo mkdir build;
|
|
||||||
cd build;
|
|
||||||
sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON ..;
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
|
|
|
@ -13,7 +13,7 @@ find_package( BLAS REQUIRED )
|
||||||
include_directories( ${BLAS_INCLUDE_DIRS} )
|
include_directories( ${BLAS_INCLUDE_DIRS} )
|
||||||
LINK_DIRECTORIES(${BLAS_LIBRARY_DIRS})
|
LINK_DIRECTORIES(${BLAS_LIBRARY_DIRS})
|
||||||
|
|
||||||
find_package( OpenCV 3.1 REQUIRED )
|
find_package( OpenCV 3.3 REQUIRED )
|
||||||
|
|
||||||
MESSAGE("OpenCV information:")
|
MESSAGE("OpenCV information:")
|
||||||
MESSAGE(" OpenCV_INCLUDE_DIRS: ${OpenCV_INCLUDE_DIRS}")
|
MESSAGE(" OpenCV_INCLUDE_DIRS: ${OpenCV_INCLUDE_DIRS}")
|
||||||
|
|
Loading…
Reference in a new issue