Skip to content

Commit ba3fc79

Browse files
authored
fix(c/validation): Use disabler pattern for validation_dep in Meson (#2849)
1 parent 2cccd56 commit ba3fc79

File tree

2 files changed

+32
-27
lines changed

2 files changed

+32
-27
lines changed

c/meson.build

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ endif
6969

7070
subdir('driver/common')
7171
subdir('driver/framework')
72-
73-
if get_option('tests').enabled()
74-
subdir('validation')
75-
endif
72+
subdir('validation')
7673

7774
if get_option('bigquery').enabled()
7875
subdir('driver/bigquery')

c/validation/meson.build

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,35 @@
1616
# under the License.
1717

1818

19-
adbc_validation_util_lib = static_library(
20-
'adbc_validation_util',
21-
'adbc_validation_util.cc',
22-
include_directories: [include_dir, driver_dir],
23-
link_with: [adbc_common_lib, adbc_framework_lib, adbc_driver_manager_lib],
24-
dependencies: [nanoarrow_dep, gtest_main_dep, gmock_dep],
25-
)
19+
if get_option('tests').enabled()
20+
adbc_validation_util_lib = static_library(
21+
'adbc_validation_util',
22+
'adbc_validation_util.cc',
23+
include_directories: [include_dir, driver_dir],
24+
link_with: [
25+
adbc_common_lib,
26+
adbc_framework_lib,
27+
adbc_driver_manager_lib,
28+
],
29+
dependencies: [nanoarrow_dep, gtest_main_dep, gmock_dep],
30+
)
2631

27-
adbc_validation_dep = declare_dependency(
28-
sources: [
29-
'adbc_validation.cc',
30-
'adbc_validation_connection.cc',
31-
'adbc_validation_database.cc',
32-
'adbc_validation_statement.cc',
33-
],
34-
include_directories: [include_dir, driver_dir],
35-
link_with: [
36-
adbc_validation_util_lib,
37-
adbc_common_lib,
38-
adbc_framework_lib,
39-
adbc_driver_manager_lib,
40-
],
41-
dependencies: [nanoarrow_dep, gtest_main_dep, gmock_dep],
42-
)
32+
adbc_validation_dep = declare_dependency(
33+
sources: [
34+
'adbc_validation.cc',
35+
'adbc_validation_connection.cc',
36+
'adbc_validation_database.cc',
37+
'adbc_validation_statement.cc',
38+
],
39+
include_directories: [include_dir, driver_dir],
40+
link_with: [
41+
adbc_validation_util_lib,
42+
adbc_common_lib,
43+
adbc_framework_lib,
44+
adbc_driver_manager_lib,
45+
],
46+
dependencies: [nanoarrow_dep, gtest_main_dep, gmock_dep],
47+
)
48+
else
49+
adbc_validation_dep = disabler()
50+
endif

0 commit comments

Comments
 (0)