diff --git a/appveyor.yml b/appveyor.yml index 587cfb0c73339e455469b65c759189af97d0fd2c..f4fb81d61aabc8492a94bc6c805f5d8fd7d37204 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,10 +9,18 @@ environment: - QTDIR: C:\Qt\5.13\mingw73_32 CMAKE_GENERATOR: MinGW Makefiles MINGW_PATH: C:\Qt\Tools\mingw730_32 + # https://wiki.qt.io/Qt_5.13_Tools_and_Versions + # https://www.appveyor.com/docs/windows-images-software/#tools + OPENSSL_PATH: C:\OpenSSL-v111-Win32\bin + LIBSSL: libssl-1_1.dll + LIBCRYPTO: libcrypto-1_1.dll - QTDIR: C:\Qt\5.13\mingw73_64 CMAKE_GENERATOR: MinGW Makefiles MINGW_PATH: C:\Qt\Tools\mingw730_64 + OPENSSL_PATH: C:\OpenSSL-v111-Win64\bin + LIBSSL: libssl-1_1-x64.dll + LIBCRYPTO: libcrypto-1_1-x64.dll # Parameters for default build commands (build_script is used instead). build: diff --git a/utils/appveyor/after_build.bat b/utils/appveyor/after_build.bat index 24f9710c6fe9cc7e68fc9113292ab033009a2dae..afb66b12ffcb8e1638c59192f6101c0aa13f9028 100644 --- a/utils/appveyor/after_build.bat +++ b/utils/appveyor/after_build.bat @@ -28,6 +28,9 @@ xcopy /F "%BuildRoot%\src\*.qm" "%Destination%\translations" || goto :error mkdir "%Destination%\plugins" xcopy /F "%BuildPlugins%\*.dll" "%Destination%\plugins" || goto :error +xcopy /F "%OPENSSL_PATH%\%LIBCRYPTO%" "%Destination%" || goto :error +xcopy /F "%OPENSSL_PATH%\%LIBSSL%" "%Destination%" || goto :error + %QTDIR%\bin\windeployqt --version %QTDIR%\bin\windeployqt --help %QTDIR%\bin\windeployqt --release --no-system-d3d-compiler --no-angle --no-opengl-sw "%Executable%" || goto :error diff --git a/utils/appveyor/install.bat b/utils/appveyor/install.bat index 69ee78e8a860f205c247930601c9c569c5b0b660..e0211eee030348974c31df9a2b701eff12b0839b 100644 --- a/utils/appveyor/install.bat +++ b/utils/appveyor/install.bat @@ -6,6 +6,10 @@ set CMAKE_PREFIX_PATH=%QTDIR%\lib\cmake dir %QTDIR%\bin || goto :error dir %QTDIR%\lib\cmake || goto :error +dir "%OPENSSL_PATH%" || goto :error +dir "%OPENSSL_PATH%\%LIBCRYPTO%" || goto :error +dir "%OPENSSL_PATH%\%LIBSSL%" || goto :error + REM Note: Following removes sh.exe from PATH so that CMake can generate MinGW Makefile. PATH=%MINGW_PATH%\bin;%PATH:C:\Program Files\Git\usr\bin;=%