mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

[#3731] Add missing gtest dependencies in Meson

Browse Source
This commit is contained in:
Andrei Pavel 2025-02-27 11:34:40 +02:00
parent 7d8f8fd807
commit c8c645cda2
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fuzz/meson.build
View File

@ -22,7 +22,7 @@ fuzz_lib = static_library(
'fuzz_lib', 'fuzz_lib',
fuzz_sources, fuzz_sources,
cpp_args: cpp_flags, cpp_args: cpp_flags,
dependencies: [crypto], dependencies: [crypto, gtest],
include_directories: includes, include_directories: includes,
link_with: LIBS_BUILT_SO_FAR, link_with: LIBS_BUILT_SO_FAR,
) )
@ -32,7 +32,7 @@ executable(
'fuzz_config_kea_dhcp4.cc', 'fuzz_config_kea_dhcp4.cc',
fuzz_sources, fuzz_sources,
cpp_args: cpp_flags, cpp_args: cpp_flags,
dependencies: [crypto], dependencies: [crypto, gtest],
include_directories: includes, include_directories: includes,
link_with: [dhcp4_lib, fuzz_lib] + LIBS_BUILT_SO_FAR, link_with: [dhcp4_lib, fuzz_lib] + LIBS_BUILT_SO_FAR,
) )
@ -42,7 +42,7 @@ executable(
'fuzz_config_kea_dhcp6.cc', 'fuzz_config_kea_dhcp6.cc',
fuzz_sources, fuzz_sources,
cpp_args: cpp_flags, cpp_args: cpp_flags,
dependencies: [crypto], dependencies: [crypto, gtest],
include_directories: includes, include_directories: includes,
link_with: [dhcp6_lib, fuzz_lib] + LIBS_BUILT_SO_FAR, link_with: [dhcp6_lib, fuzz_lib] + LIBS_BUILT_SO_FAR,
) )
@ -52,7 +52,7 @@ executable(
'fuzz_http_endpoint_kea_dhcp4.cc', 'fuzz_http_endpoint_kea_dhcp4.cc',
fuzz_sources, fuzz_sources,
cpp_args: cpp_flags, cpp_args: cpp_flags,
dependencies: [crypto], dependencies: [crypto, gtest],
include_directories: includes, include_directories: includes,
link_with: [dhcp4_lib, fuzz_lib] + LIBS_BUILT_SO_FAR, link_with: [dhcp4_lib, fuzz_lib] + LIBS_BUILT_SO_FAR,
) )
@ -62,7 +62,7 @@ executable(
'fuzz_http_endpoint_kea_dhcp6.cc', 'fuzz_http_endpoint_kea_dhcp6.cc',
fuzz_sources, fuzz_sources,
cpp_args: cpp_flags, cpp_args: cpp_flags,
dependencies: [crypto], dependencies: [crypto, gtest],
include_directories: includes, include_directories: includes,
link_with: [dhcp6_lib, fuzz_lib] + LIBS_BUILT_SO_FAR, link_with: [dhcp6_lib, fuzz_lib] + LIBS_BUILT_SO_FAR,
) )
@ -72,7 +72,7 @@ executable(
'fuzz_packets_kea_dhcp4.cc', 'fuzz_packets_kea_dhcp4.cc',
fuzz_sources, fuzz_sources,
cpp_args: cpp_flags, cpp_args: cpp_flags,
dependencies: [crypto], dependencies: [crypto, gtest],
include_directories: includes, include_directories: includes,
link_with: [dhcp4_lib, kea_dhcpsrv_lib, fuzz_lib] + LIBS_BUILT_SO_FAR, link_with: [dhcp4_lib, kea_dhcpsrv_lib, fuzz_lib] + LIBS_BUILT_SO_FAR,
) )
@ -82,7 +82,7 @@ executable(
'fuzz_packets_kea_dhcp6.cc', 'fuzz_packets_kea_dhcp6.cc',
fuzz_sources, fuzz_sources,
cpp_args: cpp_flags, cpp_args: cpp_flags,
dependencies: [crypto], dependencies: [crypto, gtest],
include_directories: includes, include_directories: includes,
link_with: [dhcp6_lib, kea_dhcpsrv_lib, fuzz_lib] + LIBS_BUILT_SO_FAR, link_with: [dhcp6_lib, kea_dhcpsrv_lib, fuzz_lib] + LIBS_BUILT_SO_FAR,
) )
@ -92,7 +92,7 @@ executable(
'fuzz_unix_socket_kea_dhcp4.cc', 'fuzz_unix_socket_kea_dhcp4.cc',
fuzz_sources, fuzz_sources,
cpp_args: cpp_flags, cpp_args: cpp_flags,
dependencies: [crypto], dependencies: [crypto, gtest],
include_directories: includes, include_directories: includes,
link_with: [dhcp4_lib, kea_testutils_lib, fuzz_lib] + LIBS_BUILT_SO_FAR, link_with: [dhcp4_lib, kea_testutils_lib, fuzz_lib] + LIBS_BUILT_SO_FAR,
) )
@ -102,7 +102,7 @@ executable(
'fuzz_unix_socket_kea_dhcp6.cc', 'fuzz_unix_socket_kea_dhcp6.cc',
fuzz_sources, fuzz_sources,
cpp_args: cpp_flags, cpp_args: cpp_flags,
dependencies: [crypto], dependencies: [crypto, gtest],
include_directories: includes, include_directories: includes,
link_with: [dhcp6_lib, kea_testutils_lib, fuzz_lib] + LIBS_BUILT_SO_FAR, link_with: [dhcp6_lib, kea_testutils_lib, fuzz_lib] + LIBS_BUILT_SO_FAR,
) )

1
src/lib/database/testutils/meson.build
View File

@ -6,5 +6,6 @@ kea_database_testutils_lib = static_library(
'kea-database-testutils', 'kea-database-testutils',
'schema.cc', 'schema.cc',
cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"'], cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"'],
dependencies: [gtest],
include_directories: [include_directories('.')] + INCLUDES, include_directories: [include_directories('.')] + INCLUDES,
) )

2
src/lib/dhcpsrv/tests/meson.build
View File

@ -127,7 +127,7 @@ kea_dhcpsrv_tests = executable(
f'-DKEA_LFC_BUILD_DIR="@TOP_BUILD_DIR@/src/bin/lfc"', f'-DKEA_LFC_BUILD_DIR="@TOP_BUILD_DIR@/src/bin/lfc"',
f'-DDEFAULT_HOOKS_PATH="@DEFAULT_HOOKS_PATH@"', f'-DDEFAULT_HOOKS_PATH="@DEFAULT_HOOKS_PATH@"',
], ],
dependencies: [crypto], dependencies: [crypto, gtest],
include_directories: [include_directories('.')] + INCLUDES, include_directories: [include_directories('.')] + INCLUDES,
link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR, link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,
) )

2
src/lib/yang/pretests/meson.build
View File

@ -5,7 +5,7 @@ endif
sysrepo_setup_tests = executable( sysrepo_setup_tests = executable(
'kea-sysrepo-setup-tests', 'kea-sysrepo-setup-tests',
'sysrepo_setup_tests.cc', 'sysrepo_setup_tests.cc',
dependencies: NETCONF_DEPS_ARRAY, dependencies: NETCONF_DEPS_ARRAY + [gtest],
include_directories: [include_directories('.')] + INCLUDES, include_directories: [include_directories('.')] + INCLUDES,
override_options: ['cpp_std=c++20'], override_options: ['cpp_std=c++20'],
) )