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 <[email protected]>
hpcc-systems · Dec 11, 2024 · ed12648 · ed12648
1 parent 803672b
commit ed12648
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
diff --git 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": [