Merge pull request #9 from bindreams/dev/update-vcpkg

bindreams · Nov 21, 2024 · e637d1a · e637d1a
2 parents e2e3390 + 09d3916
commit e637d1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/zint/scripts/cmake/bundled-vcpkg.cmake b/src/zint/scripts/cmake/bundled-vcpkg.cmake
@@ -15,7 +15,7 @@ if(CMAKE_TOOLCHAIN_FILE STREQUAL "${BUNDLED_VCPKG_TOOLCHAIN}")
 			COMMAND "${GIT_EXECUTABLE}"
 				-c advice.detachedHead=false
 				clone https://github.com/microsoft/vcpkg
-				--branch 2024.03.25
+				--branch 2024.11.16
 				"${BUNDLED_VCPKG_PATH}"
 			COMMAND_ERROR_IS_FATAL ANY
 		)

diff --git a/src/zint/vcpkg.json b/src/zint/vcpkg.json
@@ -1,9 +1,9 @@
 {
 	"dependencies": ["zlib", "libpng", "fmt"],
-	"builtin-baseline": "a34c873a9717a888f58dc05268dea15592c2f0ff",
+	"builtin-baseline": "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c",
 	"overrides": [
 		{"name": "zlib", "version": "1.3.1"},
-		{"name": "libpng", "version": "1.6.40"},
-		{"name": "fmt", "version": "10.2.1"}
+		{"name": "libpng", "version": "1.6.43"},
+		{"name": "fmt", "version": "11.0.2"}
 	]
 }