From 35965b2e09edd8e0955dfe43201eb02b66cc02a3 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Fri, 14 Aug 2020 12:07:43 +0200 Subject: [PATCH] added OpenCV-dependency to AppVeyor/Travis CI-builds --- appveyor.yml | 2 ++ ci/install_travis.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e0afe04984..c862286068 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -72,6 +72,8 @@ install: - echo "BUILD ID Qt%QTVER%_%QTABI%_%APPVEYOR_BUILD_VERSION%_%CONFIGURATION%" # Rename sh.exe as sh.exe in PATH interferes with MinGW - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" + - cmd: choco install OpenCV + - cmd: set OPENCV_DIR=C:\tools\opencv\build build_script: # - dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\include" diff --git a/ci/install_travis.sh b/ci/install_travis.sh index 5075f061e6..7167c3397d 100644 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -23,7 +23,7 @@ conda config --add channels conda-forge --force # Useful for debugging any issues with conda conda info -a -conda_pkgs="qt cmake" +conda_pkgs="qt cmake opencv" conda create -q -p $our_install_dir ${conda_pkgs}