Skip to content

Commit 30ff680

Browse files
committed
Build libzip with static CRT and VS2019
1 parent bad320e commit 30ff680

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

LibZipSharp.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<_LibZipSharpNugetVersion>1.0.14</_LibZipSharpNugetVersion>
3+
<_LibZipSharpNugetVersion>1.0.15</_LibZipSharpNugetVersion>
44
</PropertyGroup>
55
</Project>

azure-pipelines.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ stages:
1616
jobs:
1717
- job: buildWindows
1818
pool:
19-
vmImage: vs2017-win2016
19+
vmImage: windows-latest
20+
variables:
21+
LIBZIP_FEATURES: -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF
22+
COMMON_CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 16 2019" -DBUILD_SHARED_LIBS=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_POLICY_DEFAULT_CMP0074=NEW -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
2023
steps:
2124
- script: |
2225
echo "Hello"
@@ -29,15 +32,15 @@ stages:
2932
external\vcpkg\vcpkg.exe install zlib:x64-windows-static
3033
mkdir .\build\Windows\64
3134
cd .\build\Windows\64
32-
cmake --config Release -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DCMAKE_C_FLAGS="/O2" -DCMAKE_TOOLCHAIN_FILE=..\..\..\external\vcpkg\scripts\buildsystems\vcpkg.cmake ..\..\..\external\libzip -G "Visual Studio 15 2017 Win64" -DBUILD_SHARED_LIBS=on -DVCPKG_TARGET_TRIPLET=x64-windows-static
35+
cmake $(LIBZIP_FEATURES) $(COMMON_CMAKE_PARAMS) -DZLIB_ROOT=..\..\..\external\vcpkg\installed\x64-windows-static -A x64 ..\..\..\external\libzip
3336
cmake --build . --config Release -v
3437
displayName: "x64 Build"
3538
- script: |
3639
external\vcpkg\vcpkg.exe integrate install
3740
external\vcpkg\vcpkg.exe install zlib:x86-windows-static
3841
mkdir .\build\Windows\32
3942
cd .\build\Windows\32
40-
cmake --config Release -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DCMAKE_C_FLAGS="/O2" -DCMAKE_TOOLCHAIN_FILE=..\..\..\external\vcpkg\scripts\buildsystems\vcpkg.cmake ..\..\..\external\libzip -G "Visual Studio 15 2017" -DBUILD_SHARED_LIBS=on -DVCPKG_TARGET_TRIPLET=x86-windows-static
43+
cmake $(LIBZIP_FEATURES) $(COMMON_CMAKE_PARAMS) -DZLIB_ROOT=..\..\..\external\vcpkg\installed\x86-windows-static -A Win32 ..\..\..\external\libzip
4144
cmake --build . --config Release -v
4245
displayName: "x86 Build"
4346
- task: ArchiveFiles@2

0 commit comments

Comments
 (0)