Skip to content

build(c): allow to build with system dependencies #2546

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

Merged
lidavidm merged 6 commits into from
Mar 3, 2025
Merged

build(c): allow to build with system dependencies #2546

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df3988e
Allow to build with system dependencies
m-kuhn Feb 23, 2025
fd05155
Apply suggestions from code review
m-kuhn Feb 24, 2025
521c0a1
Fix variable name
m-kuhn Feb 24, 2025
05dac28
pre-commit
m-kuhn Feb 24, 2025
c09929b
Propagate nanoarrow via target
m-kuhn Feb 25, 2025
cf2f198
make nanoarrow dependency public
m-kuhn Feb 26, 2025
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
14 changes: 11 additions & 3 deletions c/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)

include(CTest)

add_subdirectory(vendor/fmt EXCLUDE_FROM_ALL)
set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE ON)
add_subdirectory(vendor/nanoarrow)
if(ADBC_WITH_VENDORED_FMT)
add_subdirectory(vendor/fmt EXCLUDE_FROM_ALL)
set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE ON)
else()
find_package(fmt REQUIRED)
endif()
if(ADBC_WITH_VENDORED_NANOARROW)
add_subdirectory(vendor/nanoarrow)
else()
find_package(nanoarrow REQUIRED)
endif()
add_subdirectory(driver/common)
add_subdirectory(driver/framework)

Expand Down
4 changes: 4 additions & 0 deletions c/cmake_modules/DefineOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")

define_option(ADBC_GGDB_DEBUG "Pass -ggdb flag to debug builds" ON)

define_option(ADBC_WITH_VENDORED_FMT "Use vendored copy of fmt" ON)

define_option(ADBC_WITH_VENDORED_NANOARROW "Use vendored copy of nanoarrow" ON)

#----------------------------------------------------------------------
set_option_category("Test and benchmark")

Expand Down
8 changes: 6 additions & 2 deletions c/driver/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@
add_library(adbc_driver_common STATIC utils.c)
adbc_configure_target(adbc_driver_common)
set_target_properties(adbc_driver_common PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_include_directories(adbc_driver_common PRIVATE "${REPOSITORY_ROOT}/c/include"
"${REPOSITORY_ROOT}/c/vendor")
target_include_directories(adbc_driver_common PRIVATE "${REPOSITORY_ROOT}/c/include")
if(ADBC_WITH_VENDORED_NANOARROW)
target_include_directories(adbc_driver_common PRIVATE "${REPOSITORY_ROOT}/c/vendor")
else()
target_link_libraries(adbc_driver_common PRIVATE nanoarrow::nanoarrow)
endif()

if(ADBC_BUILD_TESTS)
add_test_case(driver_common_test
Expand Down