From: Andrei Pavel Date: Mon, 10 Feb 2025 11:14:54 +0000 (+0200) Subject: [#3729] Add gtest dependency to all testutils X-Git-Tag: Kea-2.7.7~238 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=212af6b8c83c93481be8022664dae4ea53d18539;p=thirdparty%2Fkea.git [#3729] Add gtest dependency to all testutils --- diff --git a/src/lib/asiolink/testutils/meson.build b/src/lib/asiolink/testutils/meson.build index 76dbb1c4e8..49c1fb7887 100644 --- a/src/lib/asiolink/testutils/meson.build +++ b/src/lib/asiolink/testutils/meson.build @@ -8,7 +8,7 @@ kea_asiolink_testutils_lib = static_library( 'test_server_unix_socket.cc', 'timed_signal.cc', cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"'], - dependencies: [gtest, crypto], + dependencies: [crypto, gtest], include_directories: [include_directories('.')] + INCLUDES, ) diff --git a/src/lib/d2srv/testutils/meson.build b/src/lib/d2srv/testutils/meson.build index 43c6135477..e7b1ba124f 100644 --- a/src/lib/d2srv/testutils/meson.build +++ b/src/lib/d2srv/testutils/meson.build @@ -6,6 +6,6 @@ kea_d2srv_testutils_lib = static_library( 'kea-d2srv-testutils', 'nc_test_utils.cc', 'stats_test_utils.cc', - dependencies: [boost, crypto], + dependencies: [boost, crypto, gtest], include_directories: [include_directories('.')] + INCLUDES, ) diff --git a/src/lib/dhcp/testutils/meson.build b/src/lib/dhcp/testutils/meson.build index e889d5e3a7..2982a83ce9 100644 --- a/src/lib/dhcp/testutils/meson.build +++ b/src/lib/dhcp/testutils/meson.build @@ -9,6 +9,6 @@ kea_dhcp_testutils_lib = static_library( 'pkt_captures6.cc', 'pkt_filter6_test_stub.cc', 'pkt_filter_test_stub.cc', - dependencies: [boost], + dependencies: [boost, gtest], include_directories: [include_directories('.')] + INCLUDES, ) diff --git a/src/lib/dhcpsrv/testutils/meson.build b/src/lib/dhcpsrv/testutils/meson.build index 15f36b9dbf..b885cc7a97 100644 --- a/src/lib/dhcpsrv/testutils/meson.build +++ b/src/lib/dhcpsrv/testutils/meson.build @@ -20,7 +20,7 @@ sources = [ 'test_config_backend_dhcp6.cc', 'test_utils.cc', ] -dependencies = [boost, crypto] +dependencies = [boost, crypto, gtest] if mysql.found() sources += ['mysql_generic_backend_unittest.cc'] dependencies += [mysql] diff --git a/src/lib/mysql/testutils/meson.build b/src/lib/mysql/testutils/meson.build index de9b90fbae..69bfc8572d 100644 --- a/src/lib/mysql/testutils/meson.build +++ b/src/lib/mysql/testutils/meson.build @@ -9,6 +9,6 @@ kea_mysql_testutils_lib = static_library( f'-DDATABASE_SCRIPTS_DIR="@DATABASE_SCRIPTS_DIR@"', f'-DDATABASE_WIPE_DIR="@DATABASE_SCRIPTS_DIR@"', ], - dependencies: [boost, mysql], + dependencies: [boost, gtest, mysql], include_directories: [include_directories('.')] + INCLUDES, ) diff --git a/src/lib/pgsql/testutils/meson.build b/src/lib/pgsql/testutils/meson.build index c12070629c..93e07c3232 100644 --- a/src/lib/pgsql/testutils/meson.build +++ b/src/lib/pgsql/testutils/meson.build @@ -9,6 +9,6 @@ kea_pgsql_testutils_lib = static_library( f'-DDATABASE_SCRIPTS_DIR="@DATABASE_SCRIPTS_DIR@"', f'-DDATABASE_WIPE_DIR="@DATABASE_SCRIPTS_DIR@"', ], - dependencies: [postgresql], + dependencies: [gtest, postgresql], include_directories: [include_directories('.')] + INCLUDES, ) diff --git a/src/lib/process/meson.build b/src/lib/process/meson.build index 45d60b22a0..6af59e2e36 100644 --- a/src/lib/process/meson.build +++ b/src/lib/process/meson.build @@ -13,7 +13,7 @@ kea_process_lib = library( 'process_messages.cc', 'redact_config.cc', cpp_args: [f'-DDATA_DIR="@DHCP_DATA_DIR@"'], - dependencies: [boost], + dependencies: [boost, gtest], include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: 'lib',