diff --git a/cmake_modules/vcpkg.cmake b/cmake_modules/vcpkg.cmake index 35e6a0652ef..9c0466ddedb 100644 --- a/cmake_modules/vcpkg.cmake +++ b/cmake_modules/vcpkg.cmake @@ -6,7 +6,6 @@ set(CMAKE_TOOLCHAIN_FILE ${HPCC_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cma set(VCPKG_ROOT ${HPCC_SOURCE_DIR}/vcpkg) set(VCPKG_INSTALLED_DIR "${VCPKG_FILES_DIR}/vcpkg_installed") set(VCPKG_INSTALL_OPTIONS "--x-abi-tools-use-exact-versions;--downloads-root=${VCPKG_FILES_DIR}/vcpkg_downloads;--x-buildtrees-root=${VCPKG_FILES_DIR}/vcpkg_buildtrees;--x-packages-root=${VCPKG_FILES_DIR}/vcpkg_packages") -set(VCPKG_VERBOSE OFF) if(WIN32) set(VCPKG_HOST_TRIPLET "x64-windows" CACHE STRING "host triplet") @@ -24,6 +23,15 @@ elseif(UNIX) set(VCPKG_TARGET_TRIPLET "x64-linux-dynamic" CACHE STRING "target triplet") endif() +message("-- vcpkg settings:") +message("---- VCPKG_FILES_DIR: ${VCPKG_FILES_DIR}") +message("---- CMAKE_TOOLCHAIN_FILE: ${CMAKE_TOOLCHAIN_FILE}") +message("---- VCPKG_ROOT: ${VCPKG_ROOT}") +message("---- VCPKG_INSTALLED_DIR: ${VCPKG_INSTALLED_DIR}") +message("---- VCPKG_INSTALL_OPTIONS: ${VCPKG_INSTALL_OPTIONS}") +message("---- VCPKG_HOST_TRIPLET: ${VCPKG_HOST_TRIPLET}") +message("---- VCPKG_TARGET_TRIPLET: ${VCPKG_TARGET_TRIPLET}") + # Create a catalog of the vcpkg dependencies --- file(GLOB VCPKG_PACKAGES ${VCPKG_FILES_DIR}/vcpkg_packages/*/CONTROL) list(APPEND VCPKG_PACKAGE_LIST "-----------------\n") diff --git a/dockerfiles/vcpkg/centos-7.dockerfile b/dockerfiles/vcpkg/centos-7.dockerfile index 19ab3186f89..f415699054e 100644 --- a/dockerfiles/vcpkg/centos-7.dockerfile +++ b/dockerfiles/vcpkg/centos-7.dockerfile @@ -7,4 +7,8 @@ RUN yum install -y \ ENTRYPOINT ["/bin/bash", "--login", "-c"] +RUN yum install -y \ + rpm-build && \ + yum -y clean all && rm -rf /var/cache + CMD ["/bin/bash"] diff --git a/plugins/couchbase/couchbaseembed.hpp b/plugins/couchbase/couchbaseembed.hpp index 3a0c4ba0557..e95d8f3dcd3 100644 --- a/plugins/couchbase/couchbaseembed.hpp +++ b/plugins/couchbase/couchbaseembed.hpp @@ -25,6 +25,7 @@ #endif //Using cpp wrapper from https://github.com/couchbaselabs/libcouchbase-cxx +#include #include #include #include diff --git a/vcpkg b/vcpkg index 70ea56ab7b2..376d53ed2f4 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 70ea56ab7b2ec07bfed8b6170cecdd85b2e36fe0 +Subproject commit 376d53ed2f40080b6c094501f1f06bb57bb153bc 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": [ diff --git a/vcpkg.json.in b/vcpkg.json.in index df7d2ce54a9..c26c8d0a390 100644 --- a/vcpkg.json.in +++ b/vcpkg.json.in @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "hpcc-platform", - "version": "9.8.0", + "version": "9.10.0", "dependencies": [ { "name": "apr", @@ -166,7 +166,6 @@ "name": "openssl", "platform": "@VCPKG_OPENSSL@" }, - "pcre2", { "name": "opentelemetry-cpp", "default-features": false, @@ -175,6 +174,7 @@ "otlp-grpc" ] }, + "pcre2", { "name": "python3", "platform": "@VCPKG_PYTHON3@ & windows"