From 9ebb7c34f4325a67e08cb8ccee2a1d00f57de30c Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 25 Jan 2020 02:40:32 +0100 Subject: [PATCH] Use appveyor provided openssl --- appveyor.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index afdca703..8781f42a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ version: 0.7.0-{build} configuration: Release -image: Visual Studio 2019 +image: Visual Studio 2017 platform: x64 environment: @@ -18,9 +18,9 @@ build: verbosity: minimal install: - - set QT_DIR=C:\Qt\5.14\msvc2017_64 + - set QT_DIR=C:\Qt\5.13\msvc2017_64 - set PATH=%PATH%;%QT_DIR%\bin - - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" + - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" build_script: # VERSION format: branch-master/branch-1.2 @@ -41,11 +41,16 @@ build_script: - echo %INSTVERSION% - echo %DATE% + - dir "C:\OpenSSL-v111-Win64" + - dir "C:\OpenSSL-v111-Win64\lib" + # Build nheko - - cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild + #- cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild + - cmake -G "Visual Studio 15 2017 Win64" -H. -Bbuild -DHUNTER_ROOT="C:\hunter" -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF - -DCMAKE_BUILD_TYPE=Release # -DHUNTER_CONFIGURATION_TYPES=Release + -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release + #-DUSE_BUNDLED_OPENSSL=OFF #-DOPENSSL_ROOT_DIR="C:\OpenSSL-v11-Win64" -DOPENSSL_INCLUDE_DIR="C:\OpenSSL-v11-Win64\include" -DOPENSSL_LIBRARIES="C:\OpenSSL-v11-Win64\lib" - cmake --build build --config Release