Skip to content
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.

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

GH-44465: [GLib][C++] Meson searches libraries with specific versions. #44475

Merged
merged 1 commit into from
Oct 19, 2024
Merged
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions c_glib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,23 @@ else
endif

if arrow_cpp_build_lib_dir == ''
arrow = dependency('arrow')
arrow = dependency('arrow', version: ['>=' + version])
# They are just for checking required modules are enabled. They are built into
# libarrow.so. So we don't need additional build flags for them.
dependency('arrow-compute')
dependency('arrow-csv')
dependency('arrow-filesystem')
dependency('arrow-json')
dependency('arrow-compute', version: ['>=' + version])
dependency('arrow-csv', version: ['>=' + version])
dependency('arrow-filesystem', version: ['>=' + version])
dependency('arrow-json', version: ['>=' + version])

have_arrow_orc = dependency('arrow-orc', required: false).found()
arrow_cuda = dependency('arrow-cuda', required: false)
have_arrow_orc = dependency('arrow-orc', required: false, version: ['>=' + version]).found()
arrow_cuda = dependency('arrow-cuda', required: false, version: ['>=' + version])
# we do not support compiling glib without acero engine
arrow_acero = dependency('arrow-acero', required: true)
arrow_dataset = dependency('arrow-dataset', required: false)
arrow_flight = dependency('arrow-flight', required: false)
arrow_flight_sql = dependency('arrow-flight-sql', required: false)
gandiva = dependency('gandiva', required: false)
parquet = dependency('parquet', required: false)
arrow_acero = dependency('arrow-acero', required: true, version: ['>=' + version])
arrow_dataset = dependency('arrow-dataset', required: false, version: ['>=' + version])
arrow_flight = dependency('arrow-flight', required: false, version: ['>=' + version])
arrow_flight_sql = dependency('arrow-flight-sql', required: false, version: ['>=' + version])
gandiva = dependency('gandiva', required: false, version: ['>=' + version])
parquet = dependency('parquet', required: false, version: ['>=' + version])
else
base_include_directories += [
include_directories(join_paths(arrow_cpp_build_dir, 'src')),
Expand Down
Loading