From ed126488f33b6ffeed77ad5602179a30bb07bf95 Mon Sep 17 00:00:00 2001
From: Gordon Smith <GordonJSmith@gmail.com>
Date: Wed, 11 Dec 2024 11:09:27 +0000
Subject: [PATCH] HPCC-32379: Bump vcpkg version to 2024.11.16

Fix OSX 14 (Arm) builds
Fix libmysql (Ubuntu 24.04, CentOS 8, Rocky 8)
Fix libcouchbase (Windows 2022)

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
---
 .github/workflows/build-vcpkg.yml    | 2 +-
 plugins/couchbase/couchbaseembed.hpp | 1 +
 vcpkg                                | 2 +-
 vcpkg-configuration.json             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml
index 7992beac6cd..085ef82c92a 100644
--- a/.github/workflows/build-vcpkg.yml
+++ b/.github/workflows/build-vcpkg.yml
@@ -204,7 +204,7 @@ jobs:
     with:
       os: macos-14
       build-type: 'Release'
-      cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
+      cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF -DCMAKE_OSX_ARCHITECTURES=arm64'
     secrets: inherit
 
   build-gh_runner-macos-13:
diff --git a/plugins/couchbase/couchbaseembed.hpp b/plugins/couchbase/couchbaseembed.hpp
index 3a0c4ba0557..e1f037d66bf 100644
--- a/plugins/couchbase/couchbaseembed.hpp
+++ b/plugins/couchbase/couchbaseembed.hpp
@@ -24,6 +24,7 @@
 #define COUCHBASEEMBED_PLUGIN_API DECL_IMPORT
 #endif
 
+#include <cassert>
 //Using cpp wrapper from https://github.com/couchbaselabs/libcouchbase-cxx
 #include <libcouchbase/couchbase++.h>
 #include <libcouchbase/couchbase++/views.h>
diff --git a/vcpkg b/vcpkg
index 70ea56ab7b2..feb2f6b7f74 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit 70ea56ab7b2ec07bfed8b6170cecdd85b2e36fe0
+Subproject commit feb2f6b7f74294dc894c7d94138e00df6cedf033
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
index 7ed29e6c79b..bff4e206ca6 100644
--- a/vcpkg-configuration.json
+++ b/vcpkg-configuration.json
@@ -2,7 +2,7 @@
   "default-registry": {
     "kind": "git",
     "repository": "https://github.com/microsoft/vcpkg",
-    "baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625"
+    "baseline": "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c"
   },
   "registries": [],
   "overlay-ports": [