Skip to content

Commit c5bd9c3

Browse files
authored
GH-48115: [C++] Better align Meson configuration and config.h (#48116)
### Rationale for this change This ensures configuration settings properly match in Meson ### What changes are included in this PR? Better aligned config.h with the top level meson.build settings ### Are these changes tested? Yes ### Are there any user-facing changes? No * GitHub Issue: #48115 Authored-by: Will Ayd <[email protected]> Signed-off-by: Raúl Cumplido <[email protected]>
1 parent 2a5120d commit c5bd9c3

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

cpp/meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ endif
5353

5454
needs_benchmarks = get_option('benchmarks').enabled()
5555
needs_csv = get_option('csv').enabled()
56+
needs_cuda = false
5657
needs_substrait = get_option('substrait').enabled()
5758
needs_dataset = get_option('dataset').enabled() or needs_substrait
5859
needs_azure = get_option('azure').enabled()
@@ -75,7 +76,8 @@ needs_integration = get_option('integration').enabled()
7576
needs_tests = get_option('tests').enabled()
7677
needs_acero = get_option('acero').enabled() or needs_dataset
7778
needs_compute = get_option('compute').enabled() or needs_acero
78-
needs_flight = get_option('flight').enabled()
79+
needs_flight_sql = false
80+
needs_flight = get_option('flight').enabled() or needs_flight_sql
7981
needs_gandiva = false
8082
needs_ipc = (get_option('ipc').enabled()
8183
or needs_tests

cpp/src/arrow/util/meson.build

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,25 @@ conf_data.set('UPPERCASE_BUILD_TYPE', get_option('buildtype').to_upper())
3838
conf_data.set('ARROW_PACKAGE_KIND', get_option('package_kind'))
3939

4040
conf_data.set('ARROW_COMPUTE', needs_compute)
41-
conf_data.set('ARROW_CSV', false)
42-
conf_data.set('ARROW_CUDA', false)
43-
conf_data.set('ARROW_DATASET', false)
44-
conf_data.set('ARROW_FILESYSTEM', false)
45-
conf_data.set('ARROW_FLIGHT', false)
46-
conf_data.set('ARROW_FLIGHT_SQL', false)
41+
conf_data.set('ARROW_CSV', needs_csv)
42+
conf_data.set('ARROW_CUDA', needs_cuda)
43+
conf_data.set('ARROW_DATASET', needs_dataset)
44+
conf_data.set('ARROW_FILESYSTEM', needs_filesystem)
45+
conf_data.set('ARROW_FLIGHT', needs_flight)
46+
conf_data.set('ARROW_FLIGHT_SQL', needs_flight_sql)
4747
conf_data.set('ARROW_IPC', needs_ipc)
4848
conf_data.set('ARROW_JEMALLOC', false)
4949
conf_data.set('ARROW_JEMALLOC_VENDORED', false)
5050
conf_data.set('ARROW_JSON', needs_json)
5151
conf_data.set('ARROW_MIMALLOC', false)
52-
conf_data.set('ARROW_ORC', false)
52+
conf_data.set('ARROW_ORC', needs_orc)
5353
conf_data.set('ARROW_PARQUET', needs_parquet)
5454
conf_data.set('ARROW_SUBSTRAIT', needs_substrait)
55-
conf_data.set('ARROW_AZURE', false)
55+
conf_data.set('ARROW_AZURE', needs_azure)
5656
conf_data.set('ARROW_ENABLE_THREADING', true)
5757
conf_data.set('ARROW_GCS', needs_gcs)
58-
conf_data.set('ARROW_HDFS', false)
59-
conf_data.set('ARROW_S3', false)
58+
conf_data.set('ARROW_HDFS', needs_hdfs)
59+
conf_data.set('ARROW_S3', needs_s3)
6060
conf_data.set('ARROW_USE_GLOG', false)
6161

6262
has_int128 = cpp_compiler.has_define('__SIZEOF_INT128__')
@@ -66,7 +66,7 @@ conf_data.set('ARROW_WITH_BROTLI', needs_brotli)
6666
conf_data.set('ARROW_WITH_BZ2', needs_bz2)
6767
conf_data.set('ARROW_WITH_LZ4', needs_lz4)
6868
conf_data.set('ARROW_WITH_MUSL', false)
69-
conf_data.set('ARROW_WITH_OPENTELEMETRY', false)
69+
conf_data.set('ARROW_WITH_OPENTELEMETRY', needs_opentelemetry)
7070
conf_data.set('ARROW_WITH_RE2', false)
7171
conf_data.set('ARROW_WITH_SNAPPY', needs_snappy)
7272
conf_data.set('ARROW_WITH_UCX', false)

0 commit comments

Comments
 (0)