From 0970a010006c77dbfcee93704c52a1b8b5fc6437 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Mon, 1 Jun 2020 11:39:24 +0200 Subject: [PATCH 1/2] Optimize libzip build Explicitly pass `/O2` to MSVC to make sure we have speed-optimized binaries. Disable detection and use of `bzip2` and `LZMA` compression schemes as we don't currently need/use them. --- azure-pipelines.yml | 14 +++++++------- build_native | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0a89360d..c4947e82 100644 --- a/azure-pipelines.yml +++ b/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' \ No newline at end of file + pathToPublish: '$(Build.ArtifactStagingDirectory)/signed' diff --git a/build_native b/build_native index 6e832a83..be517d36 100755 --- a/build_native +++ b/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 ../../.. \ No newline at end of file +cd ../../.. From d3aad353a5a165b67eb0f2c3cd6f861ea56757df Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Mon, 1 Jun 2020 12:05:46 +0200 Subject: [PATCH 2/2] fixup! Optimize libzip build --- LibZipSharp.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LibZipSharp.props b/LibZipSharp.props index c003b5a0..0ffd5fc4 100644 --- a/LibZipSharp.props +++ b/LibZipSharp.props @@ -1,5 +1,5 @@ - <_LibZipSharpNugetVersion>1.0.13 + <_LibZipSharpNugetVersion>1.0.14 - \ No newline at end of file +