Skip to content

Commit

Permalink
Make turbodbc_arrow a seperate subdir
Browse files Browse the repository at this point in the history
  • Loading branch information
xhochy committed Aug 30, 2024
1 parent d572d84 commit e1e1ac5
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
19 changes: 19 additions & 0 deletions cpp/turbodbc_arrow/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
turbodbc_arrow = static_library(
'turbodbc_arrow',
[
'Library/src/arrow_result_set.cpp',
'Library/src/set_arrow_parameters.cpp',
],
dependencies: [py.dependency(), pa_dep, arrow, arrow_python],
include_directories: include_directories('Library', '../cpp_odbc/Library', '../turbodbc/Library'),
link_with: [turbodbc]
)

arrow_result_set_test = executable(
'arrow_result_set_test',
['Test/tests/arrow_result_set_test.cpp'],
dependencies: [py.dependency(embed: true), arrow, arrow_python, gtest, gtest_main, gmock],
link_with: [turbodbc_arrow],
include_directories: include_directories('Library', 'Test', '../cpp_odbc/Library', '../turbodbc/Library'),
)
test('arrow_result_set_test', arrow_result_set_test)
5 changes: 2 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ endif

subdir('cpp/cpp_odbc')
subdir('cpp/turbodbc')
subdir('cpp/turbodbc_arrow')

turbodbc_sources = [
'cpp/turbodbc_python/Library/src/determine_parameter_type.cpp',
Expand All @@ -138,15 +139,13 @@ turbodbc_sources = [
'cpp/turbodbc_numpy/Library/src/set_numpy_parameters.cpp',
'cpp/turbodbc_numpy/Library/src/string_column.cpp',
'cpp/turbodbc_numpy/Library/src/unicode_column.cpp',
'cpp/turbodbc_arrow/Library/src/arrow_result_set.cpp',
'cpp/turbodbc_arrow/Library/src/set_arrow_parameters.cpp',
]

py.extension_module(
'turbodbc_intern',
turbodbc_sources,
dependencies: deps,
link_with: [cpp_odbc, turbodbc],
link_with: [cpp_odbc, turbodbc, turbodbc_arrow],
include_directories: include_directories('cpp/cpp_odbc/Library', 'cpp/turbodbc/Library', 'cpp/turbodbc_python/Library', 'cpp/turbodbc_numpy/Library', 'cpp/turbodbc_arrow/Library'),
install: true
)
Expand Down

0 comments on commit e1e1ac5

Please sign in to comment.