From daedc52ec757abb643c94e263717aec0264f2728 Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 9 Aug 2024 13:03:40 -0500 Subject: [PATCH] replace unsupported message with disabled message when unsupported features are disabled --- lcm-java/meson.build | 2 +- meson.build | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lcm-java/meson.build b/lcm-java/meson.build index 40f0b4fa9..0d275d3f7 100644 --- a/lcm-java/meson.build +++ b/lcm-java/meson.build @@ -6,7 +6,7 @@ error_messages = ['Java is not currently supported! Try at your own risk.'] if get_option('lcm_enable_java').disabled() proceed_build = disabler() - error_messages += ['Meson configured with -Dlcm_enable_java=disabled'] + error_messages = ['Meson configured with -Dlcm_enable_java=disabled'] elif not add_languages('java', required : get_option('lcm_enable_java').enabled()) proceed_build = disabler() error_messages += ['Missing dependency java'] diff --git a/meson.build b/meson.build index 895113c6f..25b5d368b 100644 --- a/meson.build +++ b/meson.build @@ -77,7 +77,10 @@ summary_reference = {} foreach option, state: enabled_options if option == 'Build unit tests' summary_reference += {option: false} - summary_reference += {'- Build unit tests errors(s)': 'Unit tests are currently unsupported!'} + if not get_option('lcm_enable_tests').disabled() + summary_reference += {'- Build unit tests errors(s)': 'Unit tests are currently unsupported!'} + endif + summary_reference += {'- Build unit tests errors(s)': 'Meson configured with -Dlcm_enable_tests=disabled'} else summary_reference += {option: not state.disabled()} endif