fix: correct version in CMakeLists, update CI for zlib

This commit is contained in:
2026-03-27 15:06:11 +08:00
parent a0ba7c1d17
commit 6e2f40633e
3 changed files with 6 additions and 6 deletions

View File

@@ -79,9 +79,9 @@ jobs:
ren .\exiv2-0.28.7-2022msvc-AMD64 dependencies_bin ren .\exiv2-0.28.7-2022msvc-AMD64 dependencies_bin
echo ::endgroup:: echo ::endgroup::
echo ::group::===== zlib ===== echo ::group::===== zlib =====
curl -fsSL -o zlib_src.zip https://zlib.net/zlib131.zip curl -fsSL -o zlib_src.zip https://zlib.net/zlib132.zip
7z x zlib_src.zip -y -o"dependencies_src" 7z x zlib_src.zip -y -o"dependencies_src"
ren .\dependencies_src\zlib-1.3.1 zlib || goto :error ren .\dependencies_src\zlib-1.3.2 zlib || goto :error
cmake ./dependencies_src/zlib -Bbuild_dependencies/zlib -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error cmake ./dependencies_src/zlib -Bbuild_dependencies/zlib -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error
cmake --build build_dependencies/zlib --config Release --target=install || goto :error cmake --build build_dependencies/zlib --config Release --target=install || goto :error
echo ::endgroup:: echo ::endgroup::

View File

@@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(pineapple-pictures VERSION 1.3.0) # don't forget to update NEWS file and AppStream metadata. project(pineapple-pictures VERSION 1.4.0) # don't forget to update NEWS file and AppStream metadata.
include(GNUInstallDirs) include(GNUInstallDirs)
include(FeatureSummary) include(FeatureSummary)

View File

@@ -39,9 +39,9 @@ build_script:
- cd %APPVEYOR_BUILD_FOLDER% - cd %APPVEYOR_BUILD_FOLDER%
# download and install zlib for KArchive # download and install zlib for KArchive
- cd %LIBZ% - cd %LIBZ%
- curl -fsSL -o zlib131.zip https://zlib.net/zlib131.zip - curl -fsSL -o zlib132.zip https://zlib.net/zlib132.zip
- 7z x zlib131.zip -y - 7z x zlib132.zip -y
- cd zlib-1.3.1 - cd zlib-1.3.2
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX%