Use appveyor provided openssl

This commit is contained in:
Nicolas Werner 2020-01-25 02:40:32 +01:00
parent 54792b7676
commit 9ebb7c34f4
1 changed files with 10 additions and 5 deletions

View File

@ -3,7 +3,7 @@
version: 0.7.0-{build} version: 0.7.0-{build}
configuration: Release configuration: Release
image: Visual Studio 2019 image: Visual Studio 2017
platform: x64 platform: x64
environment: environment:
@ -18,9 +18,9 @@ build:
verbosity: minimal verbosity: minimal
install: 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 - 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: build_script:
# VERSION format: branch-master/branch-1.2 # VERSION format: branch-master/branch-1.2
@ -41,11 +41,16 @@ build_script:
- echo %INSTVERSION% - echo %INSTVERSION%
- echo %DATE% - echo %DATE%
- dir "C:\OpenSSL-v111-Win64"
- dir "C:\OpenSSL-v111-Win64\lib"
# Build nheko # 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_ROOT="C:\hunter"
-DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -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 - cmake --build build --config Release