From 3bcc61780bebbe86e7d2adc116a32a1272571ce9 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 20 Mar 2019 22:56:06 +0000 Subject: [PATCH] Improve AppVeyor and change opencv dep --- .appveyor.yml | 15 ++++++--------- .travis.yml | 2 +- CMakeLists.txt | 3 ++- lib/CalypDefs.h | 1 + lib/StreamHandlerOpenCV.cpp | 2 +- modules/CMakeLists.txt | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8d0809c..d411e39 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -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')) diff --git a/.travis.yml b/.travis.yml index f253aff..c8719e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 .. diff --git a/CMakeLists.txt b/CMakeLists.txt index 3122edf..7fd71ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/lib/CalypDefs.h b/lib/CalypDefs.h index 93f1c0d..8bf8031 100644 --- a/lib/CalypDefs.h +++ b/lib/CalypDefs.h @@ -29,6 +29,7 @@ #include #include #include +#include typedef unsigned short ClpPel; ///< 16-bit pixel type typedef unsigned char ClpByte; diff --git a/lib/StreamHandlerOpenCV.cpp b/lib/StreamHandlerOpenCV.cpp index 0a967ef..d4ff87b 100644 --- a/lib/StreamHandlerOpenCV.cpp +++ b/lib/StreamHandlerOpenCV.cpp @@ -29,7 +29,7 @@ #include #include -#if CV_MAJOR_VERSION >= 4 +#if CV_MAJOR_VERSION >= 3 #include #endif diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 92fa66f..bd6a46f 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -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 )