Merge pull request #58 from xamarin/optimize-winbuild

Optimize libzip build

LibZipSharp.props

@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <_LibZipSharpNugetVersion>1.0.13</_LibZipSharpNugetVersion>
+        <_LibZipSharpNugetVersion>1.0.14</_LibZipSharpNugetVersion>
     </PropertyGroup>
-</Project>
+</Project>

azure-pipelines.yml

@@ -26,19 +26,19 @@ stages:
           displayName: "Build vcpkg"
         - script: |
             external\vcpkg\vcpkg.exe integrate install
-            external\vcpkg\vcpkg.exe install zlib:x64-windows-static bzip2:x64-windows-static
+            external\vcpkg\vcpkg.exe install zlib:x64-windows-static
             mkdir .\build\Windows\64
             cd .\build\Windows\64
-            cmake -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
-            cmake --build . --config Release
+            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
+            cmake --build . --config Release -v
           displayName: "x64 Build"
         - script: |
             external\vcpkg\vcpkg.exe integrate install
-            external\vcpkg\vcpkg.exe install zlib:x86-windows-static bzip2:x86-windows-static
+            external\vcpkg\vcpkg.exe install zlib:x86-windows-static
             mkdir .\build\Windows\32
             cd .\build\Windows\32
-            cmake -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
-            cmake --build . --config Release
+            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
+            cmake --build . --config Release -v
           displayName: "x86 Build"
         - task: ArchiveFiles@2
           inputs:
@@ -271,4 +271,4 @@ stages:
           displayName: 'Publish Signed NuGets'
           inputs:
             artifactName: nuget-signed
-            pathToPublish: '$(Build.ArtifactStagingDirectory)/signed'
+            pathToPublish: '$(Build.ArtifactStagingDirectory)/signed'

build_native

@@ -8,6 +8,6 @@ cd build/$HOSTOS/$ARCH
 if [ -e "$TOOLCHAIN_FILE" ]; then
     ARGS=-DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_FILE
 fi
-cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja -DBUILD_SHARED_LIBS=ON -DOPENSSL_USE_STATIC_LIBS=ON -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF $ARGS ../../../external/libzip
+cmake --config Release -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DCMAKE_C_FLAGS="-O2" -GNinja -DCMAKE_MAKE_PROGRAM=ninja -DBUILD_SHARED_LIBS=ON -DOPENSSL_USE_STATIC_LIBS=ON -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF $ARGS ../../../external/libzip
 ninja -v
-cd ../../..
+cd ../../..