From 3ab697d05f069de42d9988eb37d80be65066c348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Tue, 22 Aug 2023 00:22:43 +0200 Subject: [PATCH] More boolean.to_string() fixes in meson.builds --- src/client/http/requestmanager/meson.build | 2 +- src/common/platform/meson.build | 8 ++++---- src/lua/meson.build | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/http/requestmanager/meson.build b/src/client/http/requestmanager/meson.build index 84aa00aa0..4dc0dfbad 100644 --- a/src/client/http/requestmanager/meson.build +++ b/src/client/http/requestmanager/meson.build @@ -9,4 +9,4 @@ elif host_platform == 'emscripten' else client_files += files('Libcurl.cpp') endif -conf_data.set('NOHTTP', not enable_http ? 'true' : 'false') +conf_data.set('NOHTTP', (not enable_http).to_string()) diff --git a/src/common/platform/meson.build b/src/common/platform/meson.build index a95de984c..ddb8a2cab 100644 --- a/src/common/platform/meson.build +++ b/src/common/platform/meson.build @@ -73,9 +73,9 @@ else 'DdirCommon.cpp', ) endif -conf_data.set('SET_WINDOW_ICON', set_window_icon ? 'true' : 'false') +conf_data.set('SET_WINDOW_ICON', set_window_icon.to_string()) conf_data.set('PATH_SEP_CHAR', path_sep_char) -conf_data.set('USE_BLUESCREEN', use_bluescreen ? 'true' : 'false') +conf_data.set('USE_BLUESCREEN', use_bluescreen.to_string()) can_install = get_option('can_install') if can_install == 'auto' @@ -90,5 +90,5 @@ endif if can_install != 'no' and can_install_enforce_no error('cannot provide install support, configure with -Dcan_install=no to fix this error') endif -conf_data.set('CAN_INSTALL', can_install != 'no' ? 'true' : 'false') -conf_data.set('INSTALL_CHECK', can_install == 'yes_check' ? 'true' : 'false') +conf_data.set('CAN_INSTALL', (can_install != 'no').to_string()) +conf_data.set('INSTALL_CHECK', (can_install == 'yes_check').to_string()) diff --git a/src/lua/meson.build b/src/lua/meson.build index 53cac68ff..13bf8f621 100644 --- a/src/lua/meson.build +++ b/src/lua/meson.build @@ -29,7 +29,7 @@ if not enable_http or host_platform == 'emscripten' else luaconsole_files += files('LuaSocketTCPHttp.cpp') endif -conf_data.set('LUACONSOLE', lua_variant != 'none' ? 'true' : 'false') +conf_data.set('LUACONSOLE', (lua_variant != 'none').to_string()) subdir('luascripts')