mirror of
https://github.com/nlohmann/json.git
synced 2026-10-08 07:27:12 +00:00
Add the StrictBinaryUTF8 and DeleteDeprecatedFunctions Meson options
JSON_StrictBinaryUTF8 (#5741) and JSON_DeleteDeprecatedFunctions (#5755) arrived with develop but were missing from the Meson build and the pkg-config file, so check_build_options failed. Both Meson options default to false and add JSON_STRICT_BINARY_UTF8=1 and JSON_DELETE_DEPRECATED_FUNCTIONS=1 to the dependency, the pkg-config file, and the generated CMake target; CMake's pkg-config file now carries both definitions too. The ci_meson_install job sets and checks them in its non-default install. Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
5 files changed
+30
-2
No files matched your search
@@ -39,6 +39,12 @@ endif
|
||||
if get_option('StrictNulHandling')
|
||||
json_defines += 'JSON_STRICT_NUL_HANDLING=1'
|
||||
endif
|
||||
if get_option('StrictBinaryUTF8')
|
||||
json_defines += 'JSON_STRICT_BINARY_UTF8=1'
|
||||
endif
|
||||
if get_option('DeleteDeprecatedFunctions')
|
||||
json_defines += 'JSON_DELETE_DEPRECATED_FUNCTIONS=1'
|
||||
endif
|
||||
|
||||
cpp_args = []
|
||||
foreach define : json_defines
|
||||
|
||||
Reference in new issue
Block a user