JSON_DisableTupleReferenceConversion (#5598) came in with the develop
merge. Meson gets the matching option, and both the Meson and the CMake
pkg-config file carry JSON_DISABLE_TUPLE_REFERENCE_CONVERSION=1 when it
is enabled. The ci_meson_install job checks it.
Reported by @heitbaum in #5587.
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
Finish the Meson changes from #4452:
- Offer all eight options that change the CMake target, named like the
CMake options without the JSON_ prefix. MultipleHeaders defaults to
false so that existing Meson users keep the single header.
- Add a compile definition only for an option that differs from its
default, exactly as target_compile_definitions does. Before, the
GlobalUDLs and ImplicitConversions definitions were inverted and were
also added in the default configuration.
- Keep the nlohmann_json_multiple_headers dependency that earlier
versions of meson.build provided.
- Put the definitions into the pkg-config file and the Meson-generated
nlohmann_jsonTargets.cmake, and install the pkg-config file into
<datadir>/pkgconfig like CMake does.
- Ship meson_options.txt in include.zip, since meson.build now reads
options and the zip is documented as a Meson subproject.
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This uses a meson option (set in `meson_options.txt`) to control whether
multi-header or single-header setup is wanted.
Signed-off-by: Dylan Baker <dylan@pnwbakers.com>
Niels Lohmann
Dylan Baker