From b65e362b26159af0e732b998ed0f913aa422c1cd Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 9 Sep 2024 10:24:51 -0700 Subject: [PATCH] meson: add support for the ImplictConversions option --- meson.build | 2 ++ meson_options.txt | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/meson.build b/meson.build index 699726b9c5..a8b92f30fa 100644 --- a/meson.build +++ b/meson.build @@ -15,6 +15,8 @@ endif cpp_args = [ '-DJSON_USE_GLOBAL_UDLS=@0@'.format( (not get_option('GlobalUDLs')).to_int()), + '-DJSON_USE_IMPLICIT_CONVERSIONS=@0@'.format( + (not get_option('ImplicitConversions')).to_int()), ] nlohmann_json_dep = declare_dependency( diff --git a/meson_options.txt b/meson_options.txt index 347facca3f..770fc722fd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,3 +10,9 @@ option( value: true, description: 'Place user-defined string literals in the global namespace', ) +option( + 'ImplicitConversions', + type: 'boolean', + value: true, + description: 'Enable implicit conversions', +)