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

[#3730] Replace HAS_KEA_MSG_COMPILER with KEA_MSG_COMPILER.found()

Browse Source
This commit is contained in:
Andrei Pavel 2025-02-21 11:33:11 +02:00
parent 7ae2b5a197
commit ac5c781575
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
30 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -181,8 +181,8 @@ endif
if awk_exe.found()
AWK = awk_exe.full_path()
endif
CD_AND_RUN = f'@TOP_SOURCE_DIR@/cd-and-run.sh'
KEA_MSG_COMPILER = f'@TOP_BUILD_DIR@/src/lib/log/compiler/kea-msg-compiler'
CD_AND_RUN = find_program(f'@TOP_SOURCE_DIR@/cd-and-run.sh')
KEA_MSG_COMPILER = disabler()
#### Dependencies

2
src/bin/agent/meson.build
View File

@ -26,7 +26,7 @@ executable(
subdir('tests')
current_source_dir = meson.current_source_dir()
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-bin-agent-ca_messages',
command: [

2
src/bin/dhcp4/meson.build
View File

@ -25,7 +25,7 @@ executable(
subdir('tests')
current_source_dir = meson.current_source_dir()
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-bin-dhcp4-dhcp4_messages',
command: [

2
src/bin/dhcp6/meson.build
View File

@ -26,7 +26,7 @@ executable(
subdir('tests')
current_source_dir = meson.current_source_dir()
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-bin-dhcp6-dhcp6_messages',
command: [

2
src/bin/lfc/meson.build
View File

@ -15,7 +15,7 @@ executable(
)
subdir('tests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-bin-lfc-lfc_messages',
command: [

2
src/bin/netconf/meson.build
View File

@ -39,7 +39,7 @@ executable(
subdir('tests')
current_source_dir = meson.current_source_dir()
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-bin-netconf-netconf_messages',
command: [

2
src/hooks/dhcp/bootp/meson.build
View File

@ -17,7 +17,7 @@ dhcp_bootp_archive = static_library(
subdir('libloadtests')
subdir('tests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-hooks-dhcp-bootp-bootp_messages',
command: [

2
src/hooks/dhcp/flex_option/meson.build
View File

@ -19,7 +19,7 @@ dhcp_flex_option_archive = static_library(
subdir('libloadtests')
subdir('tests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-hooks-dhcp-flex_option-flex_option_messages',
command: [

2
src/hooks/dhcp/high_availability/meson.build
View File

@ -28,7 +28,7 @@ dhcp_ha_archive = static_library(
subdir('libloadtests')
subdir('tests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-hooks-dhcp-high_availability-ha_messages',
command: [

4
src/hooks/dhcp/lease_cmds/meson.build
View File

@ -21,13 +21,13 @@ dhcp_lease_cmds_archive = static_library(
subdir('libloadtests')
subdir('tests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-hooks-dhcp-lease_cmds-lease_cmds_messages',
command: [
CD_AND_RUN,
TOP_SOURCE_DIR,
kea_msg_compiler,
KEA_MSG_COMPILER,
'src/hooks/dhcp/lease_cmds/lease_cmds_messages.mes',
],
)

2
src/hooks/dhcp/mysql/meson.build
View File

@ -31,7 +31,7 @@ dhcp_mysql_archive = static_library(
subdir('libloadtests')
subdir('tests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-hooks-dhcp-mysql-mysql_cb_messages',
command: [

2
src/hooks/dhcp/perfmon/meson.build
View File

@ -24,7 +24,7 @@ dhcp_perfmon_archive = static_library(
subdir('libloadtests')
subdir('tests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-hooks-dhcp-perfmon-perfmon_messages',
command: [

2
src/hooks/dhcp/pgsql/meson.build
View File

@ -31,7 +31,7 @@ dhcp_pgsql_archive = static_library(
subdir('libloadtests')
subdir('tests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-hooks-dhcp-pgsql-pgsql_cb_messages',
command: [

2
src/hooks/dhcp/run_script/meson.build
View File

@ -20,7 +20,7 @@ dhcp_run_script_archive = static_library(
subdir('tests')
subdir('libloadtests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-hooks-dhcp-run_script-run_script_messages',
command: [

2
src/hooks/dhcp/stat_cmds/meson.build
View File

@ -18,7 +18,7 @@ dhcp_stat_cmds_archive = static_library(
)
subdir('libloadtests')
subdir('tests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-hooks-dhcp-stat_cmds-stat_cmds_messages',
command: [

2
src/hooks/dhcp/user_chk/meson.build
View File

@ -23,7 +23,7 @@ dhcp_user_chk_archive = static_library(
)
subdir('tests')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-hooks-dhcp-user_chk-user_chk_messages',
command: [

2
src/lib/asiodns/meson.build
View File

@ -13,7 +13,7 @@ subdir('tests')
kea_asiodns_headers = ['asiodns_messages.h', 'io_fetch.h', 'logger.h']
install_headers(kea_asiodns_headers, preserve_path: true, subdir: 'kea/asiodns')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-asiodns-asiodns_messages',

2
src/lib/config/meson.build
View File

@ -42,7 +42,7 @@ kea_config_headers = [
]
install_headers(kea_config_headers, preserve_path: true, subdir: 'kea/config')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-config-config_messages',

2
src/lib/d2srv/meson.build
View File

@ -35,7 +35,7 @@ kea_d2srv_headers = [
]
install_headers(kea_d2srv_headers, preserve_path: true, subdir: 'kea/d2srv')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-d2srv-d2_messages',

2
src/lib/database/meson.build
View File

@ -35,7 +35,7 @@ install_headers(
subdir: 'kea/database',
)
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-database-db_messages',

2
src/lib/dhcp_ddns/meson.build
View File

@ -25,7 +25,7 @@ install_headers(
subdir: 'kea/dhcp_ddns',
)
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-dhcp_ddns-dhcp_ddns_messages',

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

@ -206,7 +206,7 @@ kea_dhcpsrv_headers = [
]
install_headers(kea_dhcpsrv_headers, preserve_path: true, subdir: 'kea/dhcpsrv')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-dhcpsrv-alloc_engine_messages',

2
src/lib/eval/meson.build
View File

@ -28,7 +28,7 @@ kea_eval_headers = [
install_headers(kea_eval_headers, preserve_path: true, subdir: 'kea/eval')
current_source_dir = meson.current_source_dir()
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
target_gen_messages = run_target(
'src-lib-eval-eval_messages',
command: [

2
src/lib/hooks/meson.build
View File

@ -41,7 +41,7 @@ kea_hooks_headers = [
]
install_headers(kea_hooks_headers, preserve_path: true, subdir: 'kea/hooks')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-hooks-hooks_messages',

2
src/lib/http/meson.build
View File

@ -69,7 +69,7 @@ kea_http_headers = [
]
install_headers(kea_http_headers, preserve_path: true, subdir: 'kea/http')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-http-auth_messages',

4
src/lib/log/compiler/meson.build
View File

@ -1,13 +1,11 @@
if meson.is_cross_build()
HAS_KEA_MSG_COMPILER = false
subdir_done()
endif
kea_msg_compiler = executable(
KEA_MSG_COMPILER = executable(
'kea-msg-compiler',
'message.cc',
include_directories: INCLUDES,
install_dir: 'bin',
link_with: LIBS_BUILT_SO_FAR,
)
HAS_KEA_MSG_COMPILER = true

2
src/lib/log/meson.build
View File

@ -55,7 +55,7 @@ kea_log_headers = [
]
install_headers(kea_log_headers, preserve_path: true, subdir: 'kea/log')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-log-log_messages',

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

@ -90,7 +90,7 @@ foreach shtest : shtests
)
endforeach
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-log-tests-log_test_messages',

2
src/lib/process/meson.build
View File

@ -39,7 +39,7 @@ kea_process_headers = [
]
install_headers(kea_process_headers, preserve_path: true, subdir: 'kea/process')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-process-process_messages',

2
src/lib/tcp/meson.build
View File

@ -27,7 +27,7 @@ kea_tcp_headers = [
]
install_headers(kea_tcp_headers, preserve_path: true, subdir: 'kea/tcp')
if HAS_KEA_MSG_COMPILER
if KEA_MSG_COMPILER.found()
current_source_dir = meson.current_source_dir()
target_gen_messages = run_target(
'src-lib-tcp-tcp_messages',