Skip to content

Commit 0970a01

Browse files
grendellogrendello
committed
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.
1 parent d321af1 commit 0970a01

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎azure-pipelines.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ stages:
2626
displayName: "Build vcpkg"
2727
- script: |
2828
external\vcpkg\vcpkg.exe integrate install
29-
external\vcpkg\vcpkg.exe install zlib:x64-windows-static bzip2:x64-windows-static
29+
external\vcpkg\vcpkg.exe install zlib:x64-windows-static
3030
mkdir .\build\Windows\64
3131
cd .\build\Windows\64
32-
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
33-
cmake --build . --config Release
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
33+
cmake --build . --config Release -v
3434
displayName: "x64 Build"
3535
- script: |
3636
external\vcpkg\vcpkg.exe integrate install
37-
external\vcpkg\vcpkg.exe install zlib:x86-windows-static bzip2:x86-windows-static
37+
external\vcpkg\vcpkg.exe install zlib:x86-windows-static
3838
mkdir .\build\Windows\32
3939
cd .\build\Windows\32
40-
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
41-
cmake --build . --config Release
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
41+
cmake --build . --config Release -v
4242
displayName: "x86 Build"
4343
- task: ArchiveFiles@2
4444
inputs:
@@ -271,4 +271,4 @@ stages:
271271
displayName: 'Publish Signed NuGets'
272272
inputs:
273273
artifactName: nuget-signed
274-
pathToPublish: '$(Build.ArtifactStagingDirectory)/signed'
274+
pathToPublish: '$(Build.ArtifactStagingDirectory)/signed'

‎build_native‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ cd build/$HOSTOS/$ARCH
88
if [ -e "$TOOLCHAIN_FILE" ]; then
99
ARGS=-DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_FILE
1010
fi
11-
cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja -DBUILD_SHARED_LIBS=ON -DOPENSSL_USE_STATIC_LIBS=ON -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF $ARGS ../../../external/libzip
11+
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
1212
ninja -v
13-
cd ../../..
13+
cd ../../..

0 commit comments

Comments
 (0)