mirror of
https://github.com/zeromq/libzmq.git
synced 2025-01-31 14:39:55 +01:00
Merge pull request #2846 from bluca/appveyor_vs2013
Problem: no coverage for VS2013 and VS2017
This commit is contained in:
commit
d8aa8fc794
30
appveyor.yml
30
appveyor.yml
@ -35,6 +35,22 @@ environment:
|
||||
configuration: Release
|
||||
WITH_LIBSODIUM: OFF
|
||||
ENABLE_CURVE: ON
|
||||
- platform: Win32
|
||||
configuration: Release
|
||||
WITH_LIBSODIUM: ON
|
||||
ENABLE_CURVE: ON
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
|
||||
CMAKE_GENERATOR: "Visual Studio 12 2013"
|
||||
MSVCVERSION: "v120"
|
||||
MSVCYEAR: "vs2013"
|
||||
- platform: Win32
|
||||
configuration: Release
|
||||
WITH_LIBSODIUM: ON
|
||||
ENABLE_CURVE: ON
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
CMAKE_GENERATOR: "Visual Studio 15 2017"
|
||||
MSVCVERSION: "v141"
|
||||
MSVCYEAR: "vs2017"
|
||||
|
||||
matrix:
|
||||
fast_finish: false
|
||||
@ -49,12 +65,12 @@ install:
|
||||
- cmd: if "%Platform%"=="x64" set "CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64"
|
||||
- cmd: echo "Generator='%CMAKE_GENERATOR%'"
|
||||
- cmd: echo "Platform='%Platform%'"
|
||||
- cmd: set LIBSODIUMDIR=C:\projects\libsodium
|
||||
- cmd: git clone --branch stable --depth 1 --quiet "https://github.com/jedisct1/libsodium.git" %LIBSODIUMDIR%
|
||||
- cmd: msbuild /v:minimal /maxcpucount:%NUMBER_OF_PROCESSORS% /p:Configuration=%Configuration%DLL %LIBSODIUMDIR%\builds\msvc\%MSVCYEAR%\libsodium\libsodium.vcxproj
|
||||
- cmd: set SODIUM_LIBRARY_DIR="%LIBSODIUMDIR%\bin\%Platform%\%Configuration%\%MSVCVERSION%\dynamic"
|
||||
- cmd: set SODIUM_INCLUDE_DIR="%LIBSODIUMDIR%\src\libsodium\include"
|
||||
- cmd: move "%SODIUM_LIBRARY_DIR%\libsodium.lib" "%SODIUM_LIBRARY_DIR%\sodium.lib"
|
||||
- cmd: if "%WITH_LIBSODIUM%"=="ON" set LIBSODIUMDIR=C:\projects\libsodium
|
||||
- cmd: if "%WITH_LIBSODIUM%"=="ON" git clone --branch stable --depth 1 --quiet "https://github.com/jedisct1/libsodium.git" %LIBSODIUMDIR%
|
||||
- cmd: if "%WITH_LIBSODIUM%"=="ON" msbuild /v:minimal /maxcpucount:%NUMBER_OF_PROCESSORS% /p:Configuration=%Configuration%DLL %LIBSODIUMDIR%\builds\msvc\%MSVCYEAR%\libsodium\libsodium.vcxproj
|
||||
- cmd: if "%WITH_LIBSODIUM%"=="ON" set SODIUM_LIBRARY_DIR="%LIBSODIUMDIR%\bin\%Platform%\%Configuration%\%MSVCVERSION%\dynamic"
|
||||
- cmd: if "%WITH_LIBSODIUM%"=="ON" set SODIUM_INCLUDE_DIR="%LIBSODIUMDIR%\src\libsodium\include"
|
||||
- cmd: if "%WITH_LIBSODIUM%"=="ON" move "%SODIUM_LIBRARY_DIR%\libsodium.lib" "%SODIUM_LIBRARY_DIR%\sodium.lib"
|
||||
|
||||
clone_folder: C:\projects\libzmq
|
||||
|
||||
@ -71,7 +87,7 @@ build:
|
||||
|
||||
after_build:
|
||||
- cmd: cd %LIBZMQ_BUILDDIR%\bin\%Configuration%"
|
||||
- cmd: copy "%SODIUM_LIBRARY_DIR%\libsodium.dll" .
|
||||
- cmd: if "%WITH_LIBSODIUM%"=="ON" copy "%SODIUM_LIBRARY_DIR%\libsodium.dll" .
|
||||
- cmd: 7z a -y -bd -mx=9 libzmq.zip *.exe *.dll
|
||||
- ps: Push-AppveyorArtifact "libzmq.zip" -Filename "libzmq-${env:Platform}-${env:Configuration}.zip"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user