Skip to content

Commit 9d6d7a6

Browse files
committed
Try windows fix
1 parent 1be3825 commit 9d6d7a6

File tree

2 files changed

+41
-8
lines changed

2 files changed

+41
-8
lines changed

python/meson.build

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@ py = import('python').find_installation(pure: false)
3636

3737
#install_data('../NOTICE.txt', install_dir: py.get_install_dir() / 'pyarrow')
3838

39-
arrow_dep = dependency('arrow', 'Arrow::arrow_shared', 'Arrow::arrow_static')
39+
arrow_dep = dependency(
40+
'arrow',
41+
'Arrow',
42+
modules: ['Arrow::arrow_shared'],
43+
required: false,
44+
)
4045

4146
cc = meson.get_compiler('cpp')
4247

python/pyarrow/meson.build

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ cython_modules = {
9191
'_pyarrow_cpp_tests': {},
9292
}
9393

94-
arrow_compute_dep = dependency('arrow-compute')
94+
arrow_compute_dep = dependency(
95+
'arrow-compute',
96+
'ArrowCompute',
97+
modules: ['ArrowCompute::arrow_compute_shared'],
98+
)
9599
arrow_csv_dep = dependency('arrow-csv')
96100
arrow_fs_dep = dependency('arrow-filesystem')
97101
arrow_json_dep = dependency('arrow-json')
@@ -110,7 +114,11 @@ needs_acero = get_option('acero').enabled() or needs_dataset
110114
needs_flight = get_option('flight').enabled()
111115

112116
if needs_acero
113-
arrow_acero_dep = dependency('arrow-acero')
117+
arrow_acero_dep = dependency(
118+
'arrow-acero',
119+
'ArrowAcero',
120+
modules: ['ArrowAcero::arrow_acero_shared'],
121+
)
114122
libpyarrow_deps += [arrow_acero_dep]
115123
cython_modules += {'_acero': {'dependencies': arrow_acero_dep}}
116124
endif
@@ -120,13 +128,21 @@ if get_option('azure').enabled()
120128
endif
121129

122130
if get_option('cuda').enabled()
123-
arrow_cuda_dep = dependency('arrow-cuda')
131+
arrow_cuda_dep = dependency(
132+
'arrow-cuda',
133+
'ArrowCUDA',
134+
modules: ['ArrowCUDA::arrow_cuda_shared'],
135+
)
124136
libpyarrow_deps += [arrow_cuda_dep]
125137
cython_modules += {'_cuda': {'dependencies': arrow_cuda_dep}}
126138
endif
127139

128140
if needs_dataset
129-
arrow_dataset_dep = dependency('arrow-dataset')
141+
arrow_dataset_dep = dependency(
142+
'arrow-dataset',
143+
'ArrowDataset',
144+
modules: ['ArrowDataset::arrow_dataset_shared'],
145+
)
130146
libpyarrow_deps += [arrow_dataset_dep]
131147
cython_modules += {'_dataset': {'dependencies': arrow_dataset_dep}}
132148
endif
@@ -137,7 +153,11 @@ if needs_flight
137153
endif
138154

139155
if get_option('gandiva').enabled()
140-
gandiva_dep = dependency('gandiva')
156+
gandiva_dep = dependency(
157+
'gandiva',
158+
'Gandiva',
159+
modules: ['Gandiva::gandiva_shared'],
160+
)
141161
libpyarrow_deps += [gandiva_dep]
142162
cython_modules += {'gandiva': {'dependencies': gandiva_dep}}
143163
endif
@@ -163,7 +183,11 @@ if get_option('s3').enabled()
163183
endif
164184

165185
if needs_substrait
166-
arrow_substrait_dep = dependency('arrow-substrait')
186+
arrow_substrait_dep = dependency(
187+
'arrow-substrait',
188+
'ArrowSubstrait',
189+
modules: ['ArrowSubstrait::arrow_substrait_shared'],
190+
)
167191
libpyarrow_deps += [arrow_substrait_dep]
168192
cython_modules += {'_substrait': {'dependencies': arrow_substrait_dep}}
169193
endif
@@ -181,7 +205,11 @@ if needs_parquet_encryption and not needs_parquet
181205
endif
182206

183207
if needs_parquet
184-
parquet_dep = dependency('parquet')
208+
parquet_dep = dependency(
209+
'parquet',
210+
'Parquet',
211+
modules: ['Parquet::parquet_shared'],
212+
)
185213
libpyarrow_deps += [parquet_dep]
186214
cython_modules += {'_parquet': {'dependencies': parquet_dep}}
187215

0 commit comments

Comments
 (0)