chore: bump vcpkg and fix win32 CI build

vkensou · GordonSmith · commit 56ca93283136 · 2025-08-30T21:50:37.000+01:00
Signed-off-by: Gordon Smith &lt;GordonJSmith@gmail.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.5)
 
 project(cmcpp LANGUAGES CXX)
 
-option(BUILD_SAMPLES "Build samples" ON)
+# Determine default for BUILD_SAMPLES: OFF on Windows, ON elsewhere
+set(_BUILD_SAMPLES_DEFAULT ON)
+if (WIN32)
+    set(_BUILD_SAMPLES_DEFAULT OFF)
+endif()
+option(BUILD_SAMPLES "Build samples" ${_BUILD_SAMPLES_DEFAULT})
 option(BUILD_TESTING "Build tests" ON)
 
 add_library(cmcpp INTERFACE)
diff --git a/vcpkg b/vcpkg
@@ -1 +1 @@
-Subproject commit 3850888eb8480abc8f73f84bf618de3b68900572
+Subproject commit 120deac3062162151622ca4860575a33844ba10b
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -1,7 +1,7 @@
 {
   "default-registry": {
     "kind": "git",
-    "baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af",
+    "baseline": "120deac3062162151622ca4860575a33844ba10b",
     "repository": "https://github.com/microsoft/vcpkg"
   },
   "registries": [
diff --git a/vcpkg_overlays/wasm-micro-runtime/portfile.cmake b/vcpkg_overlays/wasm-micro-runtime/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bytecodealliance/wasm-micro-runtime
     REF "WAMR-${VERSION}"
-    SHA512 9a1dc0dd17dbf9111cf66a2d6a49565d52a005e5a024a20291cb274d826077aac46ff050c63b71503083301dfb32179a0fd3bfe2eddffce0cfb81a42a60fa439
+    SHA512 6f8b145172e8e79c8a20255e4875de5e4778c79f0ddf22d7e2e4258390d0770e180a8fdc75383bfb12310a2035bc8286ae76b474a8c2071a7be885c1d56c4b8c
     HEAD_REF main
 )
 
diff --git a/vcpkg_overlays/wasm-micro-runtime/vcpkg.json b/vcpkg_overlays/wasm-micro-runtime/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "wasm-micro-runtime",
-  "version": "2.2.0",
+  "version": "2.4.1",
   "port-version": 0,
   "description": "WebAssembly Micro Runtime (WAMR) is a lightweight standalone WebAssembly (Wasm) runtime with small footprint, high performance and highly configurable features.",
   "homepage": "https://github.com/bytecodealliance/wasm-micro-runtime",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"default-registry": {`
`3`	`3`	`"kind": "git",`
`4`		`- "baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af",`
	`4`	`+ "baseline": "120deac3062162151622ca4860575a33844ba10b",`
`5`	`5`	`"repository": "https://github.com/microsoft/vcpkg"`
`6`	`6`	`},`
`7`	`7`	`"registries": [`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ vcpkg_from_github(`
`2`	`2`	`OUT_SOURCE_PATH SOURCE_PATH`
`3`	`3`	`REPO bytecodealliance/wasm-micro-runtime`
`4`	`4`	`REF "WAMR-${VERSION}"`
`5`		`- SHA512 9a1dc0dd17dbf9111cf66a2d6a49565d52a005e5a024a20291cb274d826077aac46ff050c63b71503083301dfb32179a0fd3bfe2eddffce0cfb81a42a60fa439`
	`5`	`+ SHA512 6f8b145172e8e79c8a20255e4875de5e4778c79f0ddf22d7e2e4258390d0770e180a8fdc75383bfb12310a2035bc8286ae76b474a8c2071a7be885c1d56c4b8c`
`6`	`6`	`HEAD_REF main`
`7`	`7`	`)`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "wasm-micro-runtime",`
`3`		`- "version": "2.2.0",`
	`3`	`+ "version": "2.4.1",`
`4`	`4`	`"port-version": 0,`
`5`	`5`	`"description": "WebAssembly Micro Runtime (WAMR) is a lightweight standalone WebAssembly (Wasm) runtime with small footprint, high performance and highly configurable features.",`
`6`	`6`	`"homepage": "https://github.com/bytecodealliance/wasm-micro-runtime",`