This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new ba3fc79a1 fix(c/validation): Use disabler pattern for validation_dep
in Meson (#2849)
ba3fc79a1 is described below
commit ba3fc79a19b7f1c1802640a08ab9b7519bfe75c5
Author: William Ayd <[email protected]>
AuthorDate: Thu May 22 20:55:52 2025 -0400
fix(c/validation): Use disabler pattern for validation_dep in Meson (#2849)
---
c/meson.build | 5 +----
c/validation/meson.build | 54 +++++++++++++++++++++++++++---------------------
2 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/c/meson.build b/c/meson.build
index 0e0ce2c72..33e5db0d7 100644
--- a/c/meson.build
+++ b/c/meson.build
@@ -69,10 +69,7 @@ endif
subdir('driver/common')
subdir('driver/framework')
-
-if get_option('tests').enabled()
- subdir('validation')
-endif
+subdir('validation')
if get_option('bigquery').enabled()
subdir('driver/bigquery')
diff --git a/c/validation/meson.build b/c/validation/meson.build
index 984f4a34f..1ae46228b 100644
--- a/c/validation/meson.build
+++ b/c/validation/meson.build
@@ -16,27 +16,35 @@
# under the License.
-adbc_validation_util_lib = static_library(
- 'adbc_validation_util',
- 'adbc_validation_util.cc',
- include_directories: [include_dir, driver_dir],
- link_with: [adbc_common_lib, adbc_framework_lib, adbc_driver_manager_lib],
- dependencies: [nanoarrow_dep, gtest_main_dep, gmock_dep],
-)
+if get_option('tests').enabled()
+ adbc_validation_util_lib = static_library(
+ 'adbc_validation_util',
+ 'adbc_validation_util.cc',
+ include_directories: [include_dir, driver_dir],
+ link_with: [
+ adbc_common_lib,
+ adbc_framework_lib,
+ adbc_driver_manager_lib,
+ ],
+ dependencies: [nanoarrow_dep, gtest_main_dep, gmock_dep],
+ )
-adbc_validation_dep = declare_dependency(
- sources: [
- 'adbc_validation.cc',
- 'adbc_validation_connection.cc',
- 'adbc_validation_database.cc',
- 'adbc_validation_statement.cc',
- ],
- include_directories: [include_dir, driver_dir],
- link_with: [
- adbc_validation_util_lib,
- adbc_common_lib,
- adbc_framework_lib,
- adbc_driver_manager_lib,
- ],
- dependencies: [nanoarrow_dep, gtest_main_dep, gmock_dep],
-)
+ adbc_validation_dep = declare_dependency(
+ sources: [
+ 'adbc_validation.cc',
+ 'adbc_validation_connection.cc',
+ 'adbc_validation_database.cc',
+ 'adbc_validation_statement.cc',
+ ],
+ include_directories: [include_dir, driver_dir],
+ link_with: [
+ adbc_validation_util_lib,
+ adbc_common_lib,
+ adbc_framework_lib,
+ adbc_driver_manager_lib,
+ ],
+ dependencies: [nanoarrow_dep, gtest_main_dep, gmock_dep],
+ )
+else
+ adbc_validation_dep = disabler()
+endif
