Skip to content

build(c): automatically copy deps to output on Windows with vcpkg #4647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lidavidm wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −7
Open

build(c): automatically copy deps to output on Windows with vcpkg #4647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion c/CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions c/cmake_modules/BuildUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions c/cmake_modules/DefineOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading