This is an automated email from the ASF dual-hosted git repository.

lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git


The following commit(s) were added to refs/heads/main by this push:
     new be0b9591f build(c): automatically copy deps to output on Windows with 
vcpkg (#4647)
be0b9591f is described below

commit be0b9591f46ce6b3efbc63183b41b1e4cd766dd2
Author: David Li <[email protected]>
AuthorDate: Wed Aug 5 07:19:45 2026 +0900

    build(c): automatically copy deps to output on Windows with vcpkg (#4647)
    
    This is necessary so tests can find their dependencies. Right now you
    have to explicitly tell the build scripts to do this with a build
    option, but we can easily infer this from within CMake, so do that
    instead.
    
    Closes #3826.
    
    Assisted-by: GPT-5.6 Sol <[email protected]>
---
 c/CMakePresets.json                 | 1 -
 c/cmake_modules/BuildUtils.cmake    | 3 +--
 c/cmake_modules/DefineOptions.cmake | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/c/CMakePresets.json b/c/CMakePresets.json
index 286860fba..a5510b3fc 100644
--- a/c/CMakePresets.json
+++ b/c/CMakePresets.json
@@ -38,7 +38,6 @@
                 "ADBC_BUILD_STATIC": "OFF",
                 "ADBC_USE_ASAN": "OFF",
                 "ADBC_USE_UBSAN": "OFF",
-                "ADBC_BUILD_VCPKG": "ON",
                 "CMAKE_TOOLCHAIN_FILE": 
"$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
                 "CMAKE_C_COMPILER": "cl.exe",
                 "CMAKE_CXX_COMPILER": "cl.exe"
diff --git a/c/cmake_modules/BuildUtils.cmake b/c/cmake_modules/BuildUtils.cmake
index b76184b0e..2a0625be2 100644
--- a/c/cmake_modules/BuildUtils.cmake
+++ b/c/cmake_modules/BuildUtils.cmake
@@ -302,8 +302,7 @@ function(ADD_ARROW_LIB LIB_NAME)
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
     # If we're building on Windows using vcpkg, ensure the runtime 
dependencies of binaries are copied to the install folder.
-    # TODO(https://github.com/apache/arrow-adbc/issues/3826): auto-detect this
-    if(ADBC_BUILD_VCPKG)
+    if(WIN32 AND VCPKG_TOOLCHAIN)
       install(TARGETS ${LIB_NAME}_shared
                       RUNTIME_DEPENDENCIES
                       PRE_EXCLUDE_REGEXES
diff --git a/c/cmake_modules/DefineOptions.cmake 
b/c/cmake_modules/DefineOptions.cmake
index 3651ff5d3..7a28e57c5 100644
--- a/c/cmake_modules/DefineOptions.cmake
+++ b/c/cmake_modules/DefineOptions.cmake
@@ -237,10 +237,6 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL 
"${CMAKE_CURRENT_SOURCE_DIR}")
   define_option(ADBC_DRIVER_SQLITE "Build the SQLite driver" OFF)
 
   define_option(ADBC_INTEGRATION_DUCKDB "Build the test suite for DuckDB" OFF)
-
-  define_option(ADBC_BUILD_VCPKG
-                "Build on Windows using vcpkg for dependencies and Visual 
Studio generator."
-                OFF)
 endif()
 
 macro(validate_config)

Reply via email to