Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-test-distribute.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
- linux-vcpkg-build-test
- macos-build-test
timeout-minutes: 20
runs-on: windows-2025
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
value: "2024.10.21" # fixed version - refer 'vcpkg-auto-update.yml' for more info
vs22_vcpkg_version:
description: "vs22 vcpkg version"
value: "2026.03.18" # VCPKG-AUTO-UPDATE - refer 'vcpkg-auto-update.yml' for more info
value: "2026.04.27" # VCPKG-AUTO-UPDATE - refer 'vcpkg-auto-update.yml' for more info
# automatically computed or tag-based values
app_version:
description: "Version without namespace: v1.2.3.4"
Expand Down Expand Up @@ -312,7 +312,7 @@ jobs:

jq \
--arg vs19 "2024.10.21" \
--arg vs22 "2026.03.18" \
--arg vs22 "2026.04.27" \
'(.include[] | select(.["vcpkg-version"]=="__VCPKG_VERSION_VS19__") | .["vcpkg-version"]) = $vs19
| (.include[] | select(.["vcpkg-version"]=="__VCPKG_VERSION_VS22__") | .["vcpkg-version"]) = $vs22' \
"$MATRIX_FILE" > tmp.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/distro-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
env:
vs19_vcpkg_version: "2024.10.21"
vs22_vcpkg_version: "2026.03.18"
vs22_vcpkg_version: "2026.04.27"
outputs:
app_version: ${{ steps.set.outputs.app_version }}
release_tag: ${{ steps.set.outputs.release_tag }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pip-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ on:
type: boolean

env:
VCPKG-VERSION: '2026.03.18'
VCPKG-VERSION: '2026.04.27'
CUDA-VERSION: '12.0.1.52833'
CUDA-MAJOR: '12'
CUDA-MINOR: '0'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prepare-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,15 @@ jobs:
matrix:
include:
- vs: vs2022
runner: windows-2025
runner: windows-2022
vcpkg-version: ${{ inputs.vs22_vcpkg_version }}
vcpkg_triplet: x64-windows-meshlib
- vs: vs2019
runner: windows-2025
runner: windows-2022
vcpkg-version: ${{ inputs.vs19_vcpkg_version }}
vcpkg_triplet: x64-windows-vs2019-meshlib
- vs: vs2019
runner: windows-2025
runner: windows-2022
vcpkg-version: ${{ inputs.vs19_vcpkg_version }}
vcpkg_triplet: x64-windows-meshlib-iterator-debug
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ jobs:

windows-test:
if: ${{ inputs.test_windows }}
runs-on: windows-2025
runs-on: windows-2022
timeout-minutes: 30
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-win-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
update-win-version:
timeout-minutes: 60
runs-on: windows-2025
runs-on: windows-2022
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion docker/rockylinux8-vcpkgDockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VCPKG_VERSION=2026.03.18
ARG VCPKG_VERSION=2026.04.27
ARG VCPKG_TRIPLET=x64-linux-meshlib


Expand Down
2 changes: 1 addition & 1 deletion docker/rockylinux9-vcpkgDockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VCPKG_VERSION=2026.03.18
ARG VCPKG_VERSION=2026.04.27
ARG VCPKG_TRIPLET=x64-linux-meshlib


Expand Down
2 changes: 1 addition & 1 deletion doxygen/general_pages/CppSetupGuide.dox
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ git checkout 2024.10.21
\endcode
If you're using Visual Studio 2022 or 2026, you can use the latest version of vcpkg:
\code{.cmd}
git checkout 2026.03.18
git checkout 2026.04.27
\endcode
The version `2024.10.21` is required only for compatibility with **Visual Studio 2019**.
5. **Run the bootstrap script to build the** `vcpkg` **executable**:
Expand Down
2 changes: 1 addition & 1 deletion source/MRIOExtras/MRIOExtras.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ copy $(SolutionDir)$(Platform)\Release\laz-perf.dll $(TargetDir)laz-perf.dll
copy $(SolutionDir)$(Platform)\Release\laz-perf.exp $(TargetDir)laz-perf.exp
copy $(SolutionDir)$(Platform)\Release\laz-perf.lib $(TargetDir)laz-perf.lib
copy $(SolutionDir)$(Platform)\Release\laz-perf.pdb $(TargetDir)laz-perf.pdb
copy $(VcpkgCurrentInstalledDir)\bin\zlib1.dll $(TargetDir)zlib1.dll</Command>
copy $(VcpkgCurrentInstalledDir)\bin\zlib-ng2.dll $(TargetDir)zlib-ng2.dll</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand Down
3 changes: 2 additions & 1 deletion source/MRPython/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ IF(MSVC AND DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_TARGET_TRIPLET)

# Need a Release build of Zlib too. In Release mode it usually gets copied with something else, but in Debug we must copy manually.
# Might as well copy unconditionally here.
file(COPY ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin/zlib1.dll DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
# vcpkg's zlib port is now satisfied by zlib-ng's compat mode, so the DLL is named `zlib-ng2.dll` (was `zlib1.dll` before vcpkg 2026.04.27).
file(COPY ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin/zlib-ng2.dll DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
ENDIF()

IF(WIN32)
Expand Down
Loading