HPCC-32094 Bump vcpkg versions for 9.8.x

Switch vcpkg host triplet to match the target triplet (reduces the number of buils items) Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Jun 19, 2024 · f085cd1 · f085cd1
1 parent f6681e7
commit f085cd1
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 488 deletions.
diff --git a/cmake_modules/vcpkg.cmake b/cmake_modules/vcpkg.cmake
@@ -9,10 +9,13 @@ set(VCPKG_INSTALL_OPTIONS "--x-abi-tools-use-exact-versions;--downloads-root=${V
 set(VCPKG_VERBOSE OFF)
 
 if(WIN32)
+    set(VCPKG_HOST_TRIPLET "x64-windows" CACHE STRING "host triplet")
     set(VCPKG_TARGET_TRIPLET "x64-windows" CACHE STRING "target triplet")
 elseif(APPLE)
+    set(VCPKG_HOST_TRIPLET "x64-osx" CACHE STRING "host triplet")
     set(VCPKG_TARGET_TRIPLET "x64-osx" CACHE STRING "target triplet")
 elseif(UNIX)
+    set(VCPKG_HOST_TRIPLET "x64-linux-dynamic" CACHE STRING "host triplet")
     set(VCPKG_TARGET_TRIPLET "x64-linux-dynamic" CACHE STRING "target triplet")
 endif()
 

diff --git a/vcpkg b/vcpkg
diff --git a/vcpkg_overlays/pcre2/fix-cmake.patch b/vcpkg_overlays/pcre2/fix-cmake.patch
diff --git a/vcpkg_overlays/pcre2/no-static-suffix.patch b/vcpkg_overlays/pcre2/no-static-suffix.patch
diff --git a/vcpkg_overlays/pcre2/pcre2-10.35_fix-uwp.patch b/vcpkg_overlays/pcre2/pcre2-10.35_fix-uwp.patch