jfmcarreira/calyp
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve AppVeyor and change opencv dep

Browse Source
This commit is contained in:
jfmcarreira committed 2019-03-21 01:29:37 +00:00
1 parent 5b633f7bda
commit 3bcc61780b
6 files changed
+12 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.appveyor.yml
+6 -9
View File
@@ -9,26 +9,23 @@ init:
install:
- '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64'
#- choco install ffmpeg
#- '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64'
- choco install nsis
- choco install opencv
#- 'C:\Tools\opencv\build\setup_vars_opencv4.cmd'
- 'C:\Tools\opencv\build\setup_vars_opencv4.cmd'
- cd C:\projects
#- git clone https://github.com/ChristianFeldmann/Qt5-YUView-MT Qt --depth 1
#- set QTDIR=C:\projects\Qt\5.11-release
#- set PATH=%PATH%;%QTDIR%\bin
- ps: Start-FileDownload 'https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.1.1-win64-dev.zip'
#- 7z e ffmpeg-4.1.1-win64-dev.zip
- 7z x ffmpeg-4.1.1-win64-dev.zip -y
build_script:
- cd C:\projects\calyp
- mkdir build
- cd build
- cmake -DUSE_DYNLOAD=OFF -DOpenCV_DIR="C:/Tools/opencv/build/" -DOpenCV_DLL_DIR="C:/Tools/opencv/build/x64/vc15/bin" -DQT_DIR="C:\Qt\latest\msvc2017_64" -DQt5_DIR="C:/Qt/latest/msvc2017_64/lib/cmake/Qt5" -G "Visual Studio 15 2017 Win64" ..
- cmake -DCMAKE_BUILD_TYPE=Release -DUSE_DYNLOAD=OFF -DOpenCV_DIR="C:/Tools/opencv/build" -DOpenCV_DLL_DIR="C:/Tools/opencv/build/x64/vc15/bin" -DOpenCV_INSTALL_MODULES="" -DQT_DIR="C:\Qt\latest\msvc2017_64" -DQt5_DIR="C:\Qt\latest\msvc2017_64\lib\cmake\Qt5" -DUSE_QTDBUS=OFF -DAVFORMAT_LIBRARIES=C:/projects/ffmpeg-4.1.1-win64-dev/lib/avformat.lib -DAVFORMAT_INCLUDE_DIRS=C:/projects/ffmpeg-4.1.1-win64-dev/include -DAVCODEC_LIBRARIES=C:/projects/ffmpeg-4.1.1-win64-dev/lib/avcodec.lib -DAVCODEC_INCLUDE_DIRS=C:/projects/ffmpeg-4.1.1-win64-dev/include -DAVUTIL_LIBRARIES=C:/projects/ffmpeg-4.1.1-win64-dev/lib/avutil.lib -DAVUTIL_INCLUDE_DIRS=C:/projects/ffmpeg-4.1.1-win64-dev/include -DSWSCALE_LIBRARIES=C:/projects/ffmpeg-4.1.1-win64-dev/lib/swscale.lib -DSWSCALE_INCLUDE_DIRS=C:/projects/ffmpeg-4.1.1-win64-dev/include -G "Visual Studio 15 2017 Win64" ..
- cmake --build . --target ALL_BUILD > log_build
- cmake --build . --target INSTALL > log_install
#- cmake --build . --target PACKAGE > log_pkg
- cmake --build . --target PACKAGE > log_pkg
on_finish:
- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
.travis.yml
+1 -1
View File
@@ -2,6 +2,6 @@ language: cpp
dist: xenial
before_install:
- sudo apt-get -qq update
- sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev
- sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev libopencv-contrib-dev
script:
- mkdir -p build && cd build && cmake .. && make && cd ..
CMakeLists.txt
+2 -1
View File
@@ -105,7 +105,8 @@ ENDIF()
OPTION( USE_OPENCV "Add OpenCV support" ON )
IF( USE_OPENCV )
LIST(APPEND OPENCV_MODULES core highgui imgproc video videoio )
FIND_PACKAGE( OpenCV COMPONENTS ${OPENCV_MODULES} )
FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc video )
FIND_PACKAGE( OpenCV COMPONENTS videoio )
SET(USE_OPENCV ${OpenCV_FOUND})
ENDIF()
SET_PACKAGE_PROPERTIES(OpenCV PROPERTIES URL "http://opencv.willowgarage.com" DESCRIPTION "OpenCV library support in CalypFrame" TYPE OPTIONAL)
lib/CalypDefs.h
+1
View File
@@ -29,6 +29,7 @@
#include <algorithm>
#include <string>
#include <vector>
#include <iterator>
typedef unsigned short ClpPel; ///< 16-bit pixel type
typedef unsigned char ClpByte;
lib/StreamHandlerOpenCV.cpp
+1 -1
View File
@@ -29,7 +29,7 @@
#include <cstdio>
#include <opencv2/opencv.hpp>
#if CV_MAJOR_VERSION >= 4
#if CV_MAJOR_VERSION >= 3
#include <opencv2/videoio.hpp>
#endif
modules/CMakeLists.txt
+1 -1
View File
@@ -31,7 +31,7 @@ ADD_MODULE( LumaAverage "LumaAverage" )
ADD_MODULE( WeightedPSNR "WeightedPSNR" )
ADD_MODULE( HEVCIntraPrediction "HEVCIntraPrediction" )
ADD_MODULE_USE_OPENCV( MeasureOpticalFlowDualTVL1 "MeasureOpticalFlowDualTVL1" VERSION 2.4.13.0 MODULES video )
ADD_MODULE_USE_OPENCV( MeasureOpticalFlowDualTVL1 "MeasureOpticalFlowDualTVL1" VERSION 2.4.13.0 MODULES video optflow )
ADD_MODULE_USE_OPENCV( DisparityStereoBM "DisparityStereoBM" VERSION 2.4.13.0 MODULES calib3d )
ADD_MODULE_USE_OPENCV( DisparityStereoSGBM "DisparityStereoSGBM" VERSION 2.4.13.0 MODULES calib3d )
ADD_MODULE_USE_OPENCV( OpticalFlowDualTVL1 "OpticalFlow" VERSION 3.1.0 MODULES optflow )