From 8c54b77d880031777b482df18df24c7e236b62a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Thu, 29 Jan 2026 17:17:39 +0100 Subject: [PATCH 1/7] WIP: [CI] Try updating vcpkg baseline --- cpp/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json index d854fc339d62..17a199582372 100644 --- a/cpp/vcpkg.json +++ b/cpp/vcpkg.json @@ -62,5 +62,5 @@ "zstd" ], "$comment": "We can update builtin-baseline by 'vcpkg x-update-baseline'", - "builtin-baseline": "09f6a4ef2f08252f7f4d924fd9c2d42165fb21c9" + "builtin-baseline": "40c89449f0ccce12d21f8a906639f6c2c649b9e7" } From 10803ea4f234bb27bae5f78e17837253968a0833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Thu, 29 Jan 2026 17:37:32 +0100 Subject: [PATCH 2/7] Remove gtest feature as has been removed upstream --- cpp/vcpkg.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json index 17a199582372..ba3c8e1851b0 100644 --- a/cpp/vcpkg.json +++ b/cpp/vcpkg.json @@ -41,12 +41,7 @@ ] }, "grpc", - { - "name": "gtest", - "features": [ - "cxx17" - ] - }, + "gtest", "lz4", "openssl", "orc", From 3e8a78987d2916fdacb2c309cc4a2b321218d001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Thu, 29 Jan 2026 20:40:19 +0100 Subject: [PATCH 3/7] Guard against unofficial-utf8proc already defining utf8proc::utf8proc --- cpp/cmake_modules/Findutf8proc.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake index 75d459d0ec74..b217fdc3054e 100644 --- a/cpp/cmake_modules/Findutf8proc.cmake +++ b/cpp/cmake_modules/Findutf8proc.cmake @@ -32,7 +32,9 @@ if(ARROW_VCPKG) endif() find_package(utf8proc NAMES unofficial-utf8proc ${find_package_args}) if(utf8proc_FOUND) - add_library(utf8proc::utf8proc ALIAS utf8proc) + if(NOT TARGET utf8proc::utf8proc) + add_library(utf8proc::utf8proc ALIAS utf8proc) + endif() return() endif() endif() From 6a518f27be090e57cac40ae1b0ce0daca46b68cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 30 Jan 2026 10:07:33 +0100 Subject: [PATCH 4/7] Update vcpkg baseline for c_glib too --- c_glib/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c_glib/vcpkg.json b/c_glib/vcpkg.json index a9b1593cebe4..e640c9044bd5 100644 --- a/c_glib/vcpkg.json +++ b/c_glib/vcpkg.json @@ -7,5 +7,5 @@ "pkgconf" ], "$comment": "We can update builtin-baseline by 'vcpkg x-update-baseline'", - "builtin-baseline": "09f6a4ef2f08252f7f4d924fd9c2d42165fb21c9" + "builtin-baseline": "40c89449f0ccce12d21f8a906639f6c2c649b9e7" } From 28a5b1785332f7c7a1a3c4581118c91f2179af3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 30 Jan 2026 12:51:52 +0100 Subject: [PATCH 5/7] Drop special case for Findutf8proc when using vcpkg --- cpp/cmake_modules/Findutf8proc.cmake | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake index b217fdc3054e..2f0f59a02cdc 100644 --- a/cpp/cmake_modules/Findutf8proc.cmake +++ b/cpp/cmake_modules/Findutf8proc.cmake @@ -19,26 +19,6 @@ if(utf8proc_FOUND) return() endif() -if(ARROW_VCPKG) - set(find_package_args "") - if(utf8proc_FIND_VERSION) - list(APPEND find_package_args ${utf8proc_FIND_VERSION}) - endif() - if(utf8proc_FIND_QUIETLY) - list(APPEND find_package_args QUIET) - endif() - if(utf8proc_FIND_REQUIRED) - list(APPEND find_package_args REQUIRED) - endif() - find_package(utf8proc NAMES unofficial-utf8proc ${find_package_args}) - if(utf8proc_FOUND) - if(NOT TARGET utf8proc::utf8proc) - add_library(utf8proc::utf8proc ALIAS utf8proc) - endif() - return() - endif() -endif() - function(extract_utf8proc_version) if(utf8proc_INCLUDE_DIR) file(READ "${utf8proc_INCLUDE_DIR}/utf8proc.h" UTF8PROC_H_CONTENT) From 47ee93d8cddb22e882d2611e4351e806890f63f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 30 Jan 2026 15:16:15 +0100 Subject: [PATCH 6/7] Remove if block --- cpp/cmake_modules/Findutf8proc.cmake | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake index 2f0f59a02cdc..212f05f1840b 100644 --- a/cpp/cmake_modules/Findutf8proc.cmake +++ b/cpp/cmake_modules/Findutf8proc.cmake @@ -19,6 +19,23 @@ if(utf8proc_FOUND) return() endif() +if(ARROW_VCPKG) + set(find_package_args "") + if(utf8proc_FIND_VERSION) + list(APPEND find_package_args ${utf8proc_FIND_VERSION}) + endif() + if(utf8proc_FIND_QUIETLY) + list(APPEND find_package_args QUIET) + endif() + if(utf8proc_FIND_REQUIRED) + list(APPEND find_package_args REQUIRED) + endif() + find_package(utf8proc ${find_package_args}) + if(utf8proc_FOUND) + return() + endif() +endif() + function(extract_utf8proc_version) if(utf8proc_INCLUDE_DIR) file(READ "${utf8proc_INCLUDE_DIR}/utf8proc.h" UTF8PROC_H_CONTENT) From 4a4647dd7c8491f017a3d358c7af8ae611c5e151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 30 Jan 2026 18:00:57 +0100 Subject: [PATCH 7/7] Is the unofficial-utf8proc required? --- cpp/cmake_modules/Findutf8proc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake index 212f05f1840b..75485427222b 100644 --- a/cpp/cmake_modules/Findutf8proc.cmake +++ b/cpp/cmake_modules/Findutf8proc.cmake @@ -30,7 +30,7 @@ if(ARROW_VCPKG) if(utf8proc_FIND_REQUIRED) list(APPEND find_package_args REQUIRED) endif() - find_package(utf8proc ${find_package_args}) + find_package(utf8proc NAMES unofficial-utf8proc ${find_package_args}) if(utf8proc_FOUND) return() endif()